--- a/src/com/beem/project/beem/ui/EditSettings.java Fri Sep 25 18:25:17 2009 +0200
+++ b/src/com/beem/project/beem/ui/EditSettings.java Fri Sep 25 18:51:13 2009 +0200
@@ -552,6 +552,7 @@
@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:25:17 2009 +0200
+++ b/src/com/beem/project/beem/ui/Login.java Fri Sep 25 18:51:13 2009 +0200
@@ -3,9 +3,7 @@
import android.app.Activity;
import android.app.AlertDialog;
import android.app.ProgressDialog;
-import android.content.BroadcastReceiver;
import android.content.ComponentName;
-import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.ServiceConnection;
@@ -48,7 +46,6 @@
private SharedPreferences mSettings;
private boolean mIsConfigured;
- private BroadcastReceiver mReceiver;
/**
* Constructor.
@@ -81,13 +78,12 @@
mSettings = getSharedPreferences(getString(R.string.settings_filename), MODE_PRIVATE);
setContentView(R.layout.login);
mProgressDialog = new ProgressDialog(this);
- mReceiver = new BeemBroadcastReceiver();
}
@Override
protected void onDestroy() {
super.onDestroy();
- if (mIsConfigured && (mIsConnected || mXmppFacade == null)) {
+ if (mIsConfigured && (mIsConnected || mXmppFacade != null)) {
unbindService(mServConn);
}
}
@@ -176,12 +172,10 @@
*/
@Override
public void connectionClosed() throws RemoteException {
- /*mIsConnected = false;
+ mIsConnected = false;
if (mXmppFacade != null) {
- Login.this.unbindService(mServConn);
- Login.this.stopService(SERVICE_INTENT);
mXmppFacade = null;
- }*/
+ }
}
@Override
@@ -306,16 +300,5 @@
mIsConnected = false;
mXmppFacade = null;
}
- }
-
- private class BeemBroadcastReceiver extends BroadcastReceiver {
- @Override
- public void onReceive(Context context, Intent intent) {
- unbindService(mServConn);
- stopService(SERVICE_INTENT);
- mIsConnected = false;
- mXmppFacade = null;
- }
- }
-
+ }
}