--- a/.classpath Fri Oct 30 17:07:15 2009 +0100
+++ b/.classpath Fri Oct 30 19:24:39 2009 +0100
@@ -8,7 +8,7 @@
</attributes>
</classpathentry>
<classpathentry kind="lib" path="libs/security.jar"/>
- <classpathentry kind="lib" path="libs/smack.jar" sourcepath="/home/marseille/smack_src_3_1_0/source">
+ <classpathentry kind="lib" path="libs/smack.jar" sourcepath="/home/nikita/devel/smack/source">
<attributes>
<attribute name="javadoc_location" value="file:/home/nikita/devel/smack_src_3_1_0/javadoc/org/"/>
</attributes>
--- a/AndroidManifest.xml Fri Oct 30 17:07:15 2009 +0100
+++ b/AndroidManifest.xml Fri Oct 30 19:24:39 2009 +0100
@@ -3,7 +3,9 @@
package="com.beem.project.beem" android:versionCode="1"
android:versionName="1.0">
<application android:label="@string/app_name" android:icon="@drawable/beem_launcher_icon_silver"
- android:theme="@style/Theme.BEEM.Default" android:debuggable="true">
+ android:theme="@style/Theme.BEEM.Default" android:debuggable="true"
+ android:name="@string/app_name"
+ >
<activity android:name=".ui.Login" android:label="@string/app_name"
android:launchMode="singleTask">
<intent-filter>
--- a/src/com/beem/project/beem/service/RosterAdapter.java Fri Oct 30 17:07:15 2009 +0100
+++ b/src/com/beem/project/beem/service/RosterAdapter.java Fri Oct 30 19:24:39 2009 +0100
@@ -192,7 +192,11 @@
String user = entry.getUser();
Contact c = new Contact(user);
c.setStatus(mAdaptee.getPresence(user));
- c.setGroups(entry.getGroups());
+ try {
+ c.setGroups(entry.getGroups());
+ }catch(NullPointerException e){
+ Log.d(TAG, "Group list not ready");
+ }
c.setName(entry.getName());
return c;
}
--- a/src/com/beem/project/beem/ui/ContactList.java Fri Oct 30 17:07:15 2009 +0100
+++ b/src/com/beem/project/beem/ui/ContactList.java Fri Oct 30 19:24:39 2009 +0100
@@ -51,7 +51,7 @@
*/
public class ContactList extends Activity {
- // private static final String TAG = "CONTACTLIST_ACT";
+ //private static final String TAG = "CONTACTLIST_ACT";
private static final Intent SERVICE_INTENT = new Intent();
private static final int REQUEST_CODE = 1;
private BeemContactList mAdapterContactList;
@@ -128,6 +128,7 @@
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == REQUEST_CODE) {
if (resultCode == RESULT_OK) {
+ mListContact.clear();
stopService(SERVICE_INTENT);
finish();
startActivity(new Intent(this, Login.class));
@@ -681,6 +682,9 @@
}
mXmppFacade = null;
mRoster = null;
+ mListContact.clear();
+ mListGroup.clear();
+ mContactOnGroup.clear();
mReceiver.setBinded(false);
}
}