# HG changeset patch
# User Da Risk <darisk972@gmail.com>
# Date 1261493814 -3600
# Node ID 8d54817f081f5bf6c8ffe86f6a7f4387d0143e6d
# Parent  aa75a44fdffea012b5773fb5dc4d7598aa8d6713# Parent  cb584be7932acc24805a6241ef9276f9c6fedc9e
Merge

diff -r cb584be7932a -r 8d54817f081f AndroidManifest.xml
--- a/AndroidManifest.xml	Mon Dec 21 23:20:50 2009 +0100
+++ b/AndroidManifest.xml	Tue Dec 22 15:56:54 2009 +0100
@@ -87,6 +87,6 @@
 	<uses-permission android:name="com.beem.project.beem.BEEM_SERVICE"></uses-permission>
 	<uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"></uses-permission>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
-	<uses-sdk android:minSdkVersion="3"></uses-sdk>
+	<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="5" />
 
 </manifest> 
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_add.png
Binary file res/drawable/ic_menu_add.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_agenda.png
Binary file res/drawable/ic_menu_agenda.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_allfriends.png
Binary file res/drawable/ic_menu_allfriends.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_always_landscape_portrait.png
Binary file res/drawable/ic_menu_always_landscape_portrait.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_archive.png
Binary file res/drawable/ic_menu_archive.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_attachment.png
Binary file res/drawable/ic_menu_attachment.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_back.png
Binary file res/drawable/ic_menu_back.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_block.png
Binary file res/drawable/ic_menu_block.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_call.png
Binary file res/drawable/ic_menu_call.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_camera.png
Binary file res/drawable/ic_menu_camera.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_cc.png
Binary file res/drawable/ic_menu_cc.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_clear_playlist.png
Binary file res/drawable/ic_menu_clear_playlist.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_close_clear_cancel.png
Binary file res/drawable/ic_menu_close_clear_cancel.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_compass.png
Binary file res/drawable/ic_menu_compass.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_compose.png
Binary file res/drawable/ic_menu_compose.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_crop.png
Binary file res/drawable/ic_menu_crop.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_day.png
Binary file res/drawable/ic_menu_day.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_delete.png
Binary file res/drawable/ic_menu_delete.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_directions.png
Binary file res/drawable/ic_menu_directions.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_edit.png
Binary file res/drawable/ic_menu_edit.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_emoticons.png
Binary file res/drawable/ic_menu_emoticons.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_forward.png
Binary file res/drawable/ic_menu_forward.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_gallery.png
Binary file res/drawable/ic_menu_gallery.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_goto.png
Binary file res/drawable/ic_menu_goto.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_help.png
Binary file res/drawable/ic_menu_help.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_home.png
Binary file res/drawable/ic_menu_home.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_info_details.png
Binary file res/drawable/ic_menu_info_details.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_manage.png
Binary file res/drawable/ic_menu_manage.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_mapmode.png
Binary file res/drawable/ic_menu_mapmode.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_mark.png
Binary file res/drawable/ic_menu_mark.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_month.png
Binary file res/drawable/ic_menu_month.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_more.png
Binary file res/drawable/ic_menu_more.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_my_calendar.png
Binary file res/drawable/ic_menu_my_calendar.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_mylocation.png
Binary file res/drawable/ic_menu_mylocation.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_myplaces.png
Binary file res/drawable/ic_menu_myplaces.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_notifications.png
Binary file res/drawable/ic_menu_notifications.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_play_clip.png
Binary file res/drawable/ic_menu_play_clip.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_preferences.png
Binary file res/drawable/ic_menu_preferences.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_recent_history.png
Binary file res/drawable/ic_menu_recent_history.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_refresh.png
Binary file res/drawable/ic_menu_refresh.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_report_image.png
Binary file res/drawable/ic_menu_report_image.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_revert.png
Binary file res/drawable/ic_menu_revert.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_rotate.png
Binary file res/drawable/ic_menu_rotate.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_save.png
Binary file res/drawable/ic_menu_save.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_search.png
Binary file res/drawable/ic_menu_search.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_send.png
Binary file res/drawable/ic_menu_send.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_set_as.png
Binary file res/drawable/ic_menu_set_as.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_share.png
Binary file res/drawable/ic_menu_share.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_slideshow.png
Binary file res/drawable/ic_menu_slideshow.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_sort_alphabetically.png
Binary file res/drawable/ic_menu_sort_alphabetically.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_sort_by_size.png
Binary file res/drawable/ic_menu_sort_by_size.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_star.png
Binary file res/drawable/ic_menu_star.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_start_conversation.png
Binary file res/drawable/ic_menu_start_conversation.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_stop.png
Binary file res/drawable/ic_menu_stop.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_today.png
Binary file res/drawable/ic_menu_today.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_upload.png
Binary file res/drawable/ic_menu_upload.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_upload_you_tube.png
Binary file res/drawable/ic_menu_upload_you_tube.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_view.png
Binary file res/drawable/ic_menu_view.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_week.png
Binary file res/drawable/ic_menu_week.png has changed
diff -r cb584be7932a -r 8d54817f081f res/drawable/ic_menu_zoom.png
Binary file res/drawable/ic_menu_zoom.png has changed
diff -r cb584be7932a -r 8d54817f081f res/layout/jingle_call_activity.xml
--- a/res/layout/jingle_call_activity.xml	Mon Dec 21 23:20:50 2009 +0100
+++ b/res/layout/jingle_call_activity.xml	Tue Dec 22 15:56:54 2009 +0100
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent" android:layout_height="wrap_content"
 	android:orientation="vertical">
-	<TextView android:text="Jid:" android:id="@+id/jingledemocalljidlabel"
+<!--         <TextView android:text="Jid:" android:id="@+id/jingledemocalljidlabel"
 		android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>
 	<EditText android:id="@+id/jingledemocalljid"
 		android:layout_width="fill_parent" android:layout_height="wrap_content"></EditText>
@@ -18,5 +18,8 @@
 
 <EditText android:text="" android:id="@+id/jingledemocallreceiver" android:layout_width="fill_parent" android:layout_height="wrap_content"></EditText>
 
-<Button android:text="Call" android:id="@+id/jingledemocallbutton" android:layout_width="wrap_content" android:layout_height="wrap_content"></Button>
+<Button android:text="Call" android:id="@+id/jingledemocallbutton" android:layout_width="wrap_content" android:layout_height="wrap_content"></Button>       -->
+<ImageView android:id="@+id/log_as_logo"
+    android:layout_width="fill_parent" android:layout_height="wrap_content"
+    android:layout_marginBottom="25px" android:layout_marginTop="42px" />
 </LinearLayout>
diff -r cb584be7932a -r 8d54817f081f res/menu/contact_list.xml
--- a/res/menu/contact_list.xml	Mon Dec 21 23:20:50 2009 +0100
+++ b/res/menu/contact_list.xml	Tue Dec 22 15:56:54 2009 +0100
@@ -2,9 +2,9 @@
 	<item android:id="@+id/contact_list_menu_add_contact"
 		android:visible="true"
 		android:title="@string/contact_list_menu_add_contact"
-		android:icon="@drawable/ic_menu_add" />
+		android:icon="@android:drawable/ic_menu_add" />
 	<item android:id="@+id/contact_list_menu_settings"
 		android:visible="true"
 		android:title="@string/contact_list_menu_settings"
-		android:icon="@drawable/ic_menu_manage" />
+		android:icon="@android:drawable/ic_menu_manage" />
 </menu>
diff -r cb584be7932a -r 8d54817f081f res/menu/login.xml
--- a/res/menu/login.xml	Mon Dec 21 23:20:50 2009 +0100
+++ b/res/menu/login.xml	Tue Dec 22 15:56:54 2009 +0100
@@ -6,9 +6,9 @@
 	<item android:id="@+id/login_menu_settings"
 		android:visible="true"
 		android:title="@string/login_menu_settings"
-		android:icon="@drawable/ic_menu_manage" />
+		android:icon="@android:drawable/ic_menu_manage" />
 	<item android:id="@+id/login_menu_about"
 		android:visible="true"
 		android:title="@string/login_menu_about"
-		android:icon="@drawable/ic_menu_help" />
+		android:icon="@android:drawable/ic_menu_help" />
 </menu>
diff -r cb584be7932a -r 8d54817f081f res/menu/privacy_list.xml
--- a/res/menu/privacy_list.xml	Mon Dec 21 23:20:50 2009 +0100
+++ b/res/menu/privacy_list.xml	Tue Dec 22 15:56:54 2009 +0100
@@ -1,4 +1,4 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:id="@+id/privacy_list_menu_create" android:visible="true"
-		android:title="@string/privacy_list_menu_create" android:icon="@drawable/ic_menu_add" />
+		android:title="@string/privacy_list_menu_create" android:icon="@android:drawable/ic_menu_add" />
 </menu>
diff -r cb584be7932a -r 8d54817f081f src/com/beem/project/beem/ui/ContactList.java
--- a/src/com/beem/project/beem/ui/ContactList.java	Mon Dec 21 23:20:50 2009 +0100
+++ b/src/com/beem/project/beem/ui/ContactList.java	Tue Dec 22 15:56:54 2009 +0100
@@ -81,6 +81,7 @@
 import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.AdapterView.OnItemClickListener;
 import android.graphics.drawable.BitmapDrawable;
+import android.R.drawable;
 
 import com.beem.project.beem.R;
 import com.beem.project.beem.service.Contact;
@@ -95,7 +96,7 @@
 import com.beem.project.beem.utils.Status;
 
 /**
- * The contact list activity displays the roster of the user. TODO: Dismiss dialogs on destroy to avoid window leak
+ * The contact list activity displays the roster of the user.
  */
 public class ContactList extends Activity {
 
@@ -106,23 +107,23 @@
     }
 
     private static final int REQUEST_CODE = 1;
-    private BeemContactList mAdapterContactList;
-    private BeemBanner mAdapterBanner;
-    private IRoster mRoster;
-    private List<Contact> mListContact = new ArrayList<Contact>();
+    private final BeemContactList mAdapterContactList = new BeemContactList();
+    private final BeemBanner mAdapterBanner = new BeemBanner();
     private final List<String> mListGroup = new ArrayList<String>();
     private final Map<String, List<Contact>> mContactOnGroup = new HashMap<String, List<Contact>>();
+    private final Handler mHandler = new Handler();
+    private final ServiceConnection mServConn = new BeemServiceConnection();
+    private final BeemBroadcastReceiver mReceiver = new BeemBroadcastReceiver();
+    private final ComparatorContactListByStatusAndName<Contact> mComparator = new ComparatorContactListByStatusAndName<Contact>();
+    private final BeemRosterListener mBeemRosterListener = new BeemRosterListener();
+    private final Map<Integer, BitmapDrawable> mIconsMap = new HashMap<Integer, BitmapDrawable>();
+    private List<Contact> mListContact;
+    private IRoster mRoster;
     private String mCurGroup;
     private Contact mContact;
-    private Handler mHandler;
     private IXmppFacade mXmppFacade;
     private SharedPreferences mSettings;
-    private final ServiceConnection mServConn = new BeemServiceConnection();
-    private final BeemBroadcastReceiver mReceiver = new BeemBroadcastReceiver();
-    private final Map<Integer, BitmapDrawable> mIconsMap = new HashMap<Integer, BitmapDrawable>();
     private LayoutInflater mInflater;
-    private ComparatorContactListByStatusAndName<Contact> mComparator = new ComparatorContactListByStatusAndName<Contact>();
-    private final BeemRosterListener mBeemRosterListener = new BeemRosterListener();
 
     /**
      * Constructor.
@@ -132,24 +133,6 @@
     }
 
     /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void onCreate(Bundle saveBundle) {
-	super.onCreate(saveBundle);
-	mSettings = PreferenceManager.getDefaultSharedPreferences(this);
-	setContentView(R.layout.contactlist);
-	mAdapterContactList = new BeemContactList(this);
-	mAdapterBanner = new BeemBanner(this);
-	mHandler = new Handler();
-
-	this.registerReceiver(mReceiver, new IntentFilter(BeemBroadcastReceiver.BEEM_CONNECTION_CLOSED));
-
-	mInflater = getLayoutInflater();
-	prepareIconsStatus();
-    }
-
-    /**
      * Callback for menu creation.
      * @param menu the menu created
      * @return true on success, false otherwise
@@ -269,20 +252,52 @@
      * {@inheritDoc}
      */
     @Override
+    protected void onCreate(Bundle saveBundle) {
+	super.onCreate(saveBundle);
+	Log.v("CONTACTLIST", "onCreate");
+	mSettings = PreferenceManager.getDefaultSharedPreferences(this);
+	setContentView(R.layout.contactlist);
+
+	this.registerReceiver(mReceiver, new IntentFilter(BeemBroadcastReceiver.BEEM_CONNECTION_CLOSED));
+
+	mInflater = getLayoutInflater();
+	prepareIconsStatus();
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+    @Override
     protected void onStart() {
 	super.onStart();
 	if (mXmppFacade == null)
 	    bindService(SERVICE_INTENT, mServConn, BIND_AUTO_CREATE);
     }
+*/
+    protected void onResume() {
+	super.onResume();
+	Log.d("CONTACTLIST", "onResume");
+	if (mXmppFacade == null)
+	    bindService(SERVICE_INTENT, mServConn, BIND_AUTO_CREATE);
+    }
 
     /**
      * {@inheritDoc}
      */
     @Override
-    protected void onStop() {
-	super.onStop();
+    protected void onPause() {
+	super.onPause();
+	try {
+	    if (mRoster != null) {
+		mRoster.removeRosterListener(mBeemRosterListener);
+		mRoster = null;
+	    }
+	} catch (RemoteException e) {
+	    Log.d("ContactList", "Remode exception", e);
+	}
 	unbindService(mServConn);
 	mXmppFacade = null;
+	Log.e("CONTACTLIST", "onPause activity");
     }
 
     /*
@@ -292,14 +307,7 @@
     @Override
     protected void onDestroy() {
 	super.onDestroy();
-	try {
-	    if (mRoster != null)
-		mRoster.removeRosterListener(mBeemRosterListener);
-	} catch (RemoteException e) {
-	    Log.d("ContactList", "Remode exception", e);
-	}
 	this.unregisterReceiver(mReceiver);
-	mRoster = null;
 	Log.e("CONTACTLIST", "onDestroy activity");
     }
 
@@ -415,13 +423,13 @@
      */
     private void prepareIconsStatus() {
 	mIconsMap.put(Status.CONTACT_STATUS_AVAILABLE, new BitmapDrawable(BitmapFactory.decodeResource(getResources(),
-	    R.drawable.status_available)));
+	    android.R.drawable.presence_online)));
 	mIconsMap.put(Status.CONTACT_STATUS_AVAILABLE_FOR_CHAT, new BitmapDrawable(BitmapFactory.decodeResource(getResources(),
-	    R.drawable.status_available)));
-	mIconsMap.put(Status.CONTACT_STATUS_AWAY, new BitmapDrawable(BitmapFactory.decodeResource(getResources(), R.drawable.status_away)));
-	mIconsMap.put(Status.CONTACT_STATUS_BUSY, new BitmapDrawable(BitmapFactory.decodeResource(getResources(), R.drawable.status_dnd)));
+	    android.R.drawable.presence_online)));
+	mIconsMap.put(Status.CONTACT_STATUS_AWAY, new BitmapDrawable(BitmapFactory.decodeResource(getResources(), android.R.drawable.presence_away)));
+	mIconsMap.put(Status.CONTACT_STATUS_BUSY, new BitmapDrawable(BitmapFactory.decodeResource(getResources(), android.R.drawable.presence_busy)));
 	mIconsMap.put(Status.CONTACT_STATUS_DISCONNECT, new BitmapDrawable(BitmapFactory.decodeResource(getResources(),
-	    R.drawable.status_offline)));
+	    android.R.drawable.presence_offline)));
 	mIconsMap.put(Status.CONTACT_STATUS_UNAVAILABLE, new BitmapDrawable(BitmapFactory.decodeResource(getResources(),
 	    R.drawable.status_requested)));
     }
@@ -589,9 +597,8 @@
 
 	/**
 	 * Constructor.
-	 * @param context context activity.
 	 */
-	public BeemContactList(final Context context) {
+	public BeemContactList() {
 	}
 
 	/**
@@ -700,9 +707,8 @@
     private class BeemBanner extends BaseAdapter {
 	/**
 	 * Constructor.
-	 * @param c context activity.
 	 */
-	public BeemBanner(final Context c) {
+	public BeemBanner() {
 	}
 
 	/**
@@ -815,4 +821,8 @@
 	    mContactOnGroup.clear();
 	}
     }
+
+    protected void finalize() {
+	Log.e("CONTACTLIST", "FINALIZE");
+    }
 }