--- a/src/com/beem/project/beem/BeemService.java Fri Sep 25 18:51:13 2009 +0200
+++ b/src/com/beem/project/beem/BeemService.java Fri Sep 25 19:57:04 2009 +0200
@@ -107,7 +107,7 @@
Log.e("BEEMSERVICE", "ONBIND()");
return mBind;
}
-
+
/**
* {@inheritDoc}
*/
@@ -182,8 +182,6 @@
}
public void initJingle(XMPPConnection adaptee) {
- mJingle.initWhenConntected(adaptee);
-
+ mJingle.initWhenConntected(adaptee);
}
-
}
--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java Fri Sep 25 18:51:13 2009 +0200
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java Fri Sep 25 19:57:04 2009 +0200
@@ -269,7 +269,7 @@
public void connectionClosed() {
mRoster = null;
- final int n = mRemoteConnListeners.beginBroadcast();
+ /*final int n = mRemoteConnListeners.beginBroadcast();
for (int i = 0; i < n; i++) {
IBeemConnectionListener listener = mRemoteConnListeners.getBroadcastItem(i);
@@ -282,9 +282,10 @@
Log.w(TAG, "Error while triggering remote connection listeners", e);
}
}
- mRemoteConnListeners.finishBroadcast();
+ mRemoteConnListeners.finishBroadcast();*/
Intent closedIntent = new Intent(BEEM_CONNECTION_CLOSED);
mService.sendBroadcast(closedIntent);
+ mService.stopSelf();
}
/**
--- a/src/com/beem/project/beem/ui/AddContact.java Fri Sep 25 18:51:13 2009 +0200
+++ b/src/com/beem/project/beem/ui/AddContact.java Fri Sep 25 19:57:04 2009 +0200
@@ -3,10 +3,10 @@
import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
+
import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
-import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.ServiceConnection;
@@ -19,10 +19,12 @@
import android.widget.Button;
import android.widget.EditText;
import android.widget.Toast;
+
import com.beem.project.beem.BeemService;
import com.beem.project.beem.R;
import com.beem.project.beem.service.XmppConnectionAdapter;
import com.beem.project.beem.service.aidl.IXmppFacade;
+import com.beem.project.beem.utils.BeemBroadcastReceiver;
/**
* This activity is used to add a contact.
* @author nikita
@@ -158,14 +160,4 @@
}
};
-
- private class BeemBroadcastReceiver extends BroadcastReceiver {
- @Override
- public void onReceive(Context context, Intent intent) {
- Log.d(TAG, "broadcast received");
- stopService(SERVICE_INTENT);
- startActivity(new Intent(AddContact.this, Login.class));
- finish();
- }
- }
}
--- a/src/com/beem/project/beem/ui/ChangeStatus.java Fri Sep 25 18:51:13 2009 +0200
+++ b/src/com/beem/project/beem/ui/ChangeStatus.java Fri Sep 25 19:57:04 2009 +0200
@@ -3,7 +3,6 @@
import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
-import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.ServiceConnection;
@@ -24,6 +23,7 @@
import com.beem.project.beem.R;
import com.beem.project.beem.service.XmppConnectionAdapter;
import com.beem.project.beem.service.aidl.IXmppFacade;
+import com.beem.project.beem.utils.BeemBroadcastReceiver;
import com.beem.project.beem.utils.Status;
public class ChangeStatus extends Activity {
@@ -199,13 +199,4 @@
return (!mStatusText.getText().toString().equals(getPreferenceString(R.string.PreferenceStatusText)));
}
}
-
- private class BeemBroadcastReceiver extends BroadcastReceiver {
- @Override
- public void onReceive(Context context, Intent intent) {
- stopService(SERVICE_INTENT);
- finish();
- }
- }
-
}
--- a/src/com/beem/project/beem/ui/ContactList.java Fri Sep 25 18:51:13 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactList.java Fri Sep 25 19:57:04 2009 +0200
@@ -1,6 +1,5 @@
package com.beem.project.beem.ui;
-import java.security.spec.MGF1ParameterSpec;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -46,6 +45,7 @@
import com.beem.project.beem.service.aidl.IBeemRosterListener;
import com.beem.project.beem.service.aidl.IRoster;
import com.beem.project.beem.service.aidl.IXmppFacade;
+import com.beem.project.beem.utils.BeemBroadcastReceiver;
import com.beem.project.beem.utils.Status;
/**
@@ -53,7 +53,7 @@
*/
public class ContactList extends Activity {
- private static final String TAG = "CONTACTLIST_ACT";
+ //private static final String TAG = "CONTACTLIST_ACT";
private static final int REQUEST_CODE = 1;
private BeemContactList mAdapter;
private IRoster mRoster;
@@ -146,7 +146,6 @@
if (requestCode == REQUEST_CODE) {
if (resultCode == 69) {
finish();
- stopService(new Intent(this, BeemService.class));
startActivity(new Intent(this, Login.class));
}
}
@@ -651,14 +650,4 @@
mRoster = null;
}
}
-
- private class BeemBroadcastReceiver extends BroadcastReceiver {
- @Override
- public void onReceive(Context context, Intent intent) {
- Log.d(TAG, "broadcast received");
- stopService(SERVICE_INTENT);
- startActivity(new Intent(ContactList.this, Login.class));
- finish();
- }
- }
}
--- a/src/com/beem/project/beem/ui/EditSettings.java Fri Sep 25 18:51:13 2009 +0200
+++ b/src/com/beem/project/beem/ui/EditSettings.java Fri Sep 25 19:57:04 2009 +0200
@@ -551,7 +551,6 @@
private class BeemBroadcastReceiver extends BroadcastReceiver {
@Override
public void onReceive(Context context, Intent intent) {
- stopService(SERVICE_INTENT);
EditSettings.this.setResult(69);
}
}
--- a/src/com/beem/project/beem/ui/Login.java Fri Sep 25 18:51:13 2009 +0200
+++ b/src/com/beem/project/beem/ui/Login.java Fri Sep 25 19:57:04 2009 +0200
@@ -31,7 +31,7 @@
*/
public class Login extends Activity {
- // private static final String TAG = "LOG_AS";
+ private static final String TAG = "LOG_AS";
private static final Intent SERVICE_INTENT = new Intent();
static {
SERVICE_INTENT.setComponent(new ComponentName("com.beem.project.beem", "com.beem.project.beem.BeemService"));
@@ -271,6 +271,7 @@
@Override
public void onServiceConnected(ComponentName name, IBinder service) {
+ Log.d(TAG, "service connected");
mIsConnected = true;
mXmppFacade = IXmppFacade.Stub.asInterface(service);
try {
--- a/src/com/beem/project/beem/ui/SendIM.java Fri Sep 25 18:51:13 2009 +0200
+++ b/src/com/beem/project/beem/ui/SendIM.java Fri Sep 25 19:57:04 2009 +0200
@@ -7,7 +7,6 @@
import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
-import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.ServiceConnection;
@@ -44,6 +43,7 @@
import com.beem.project.beem.service.aidl.IMessageListener;
import com.beem.project.beem.service.aidl.IRoster;
import com.beem.project.beem.service.aidl.IXmppFacade;
+import com.beem.project.beem.utils.BeemBroadcastReceiver;
/**
* This activity class provides the view for instant messaging after selecting a correspondant.
@@ -534,14 +534,4 @@
});
}
}
-
- private class BeemBroadcastReceiver extends BroadcastReceiver {
- @Override
- public void onReceive(Context context, Intent intent) {
- Log.d(TAG, "broadcast received");
- stopService(SERVICE_INTENT);
- startActivity(new Intent(SendIM.this, Login.class));
- finish();
- }
- }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/com/beem/project/beem/utils/BeemBroadcastReceiver.java Fri Sep 25 19:57:04 2009 +0200
@@ -0,0 +1,23 @@
+package com.beem.project.beem.utils;
+
+import com.beem.project.beem.ui.Login;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * @author nikita
+ *
+ */
+public class BeemBroadcastReceiver extends BroadcastReceiver {
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ context.startActivity(new Intent(context, Login.class));
+ }
+
+}