# HG changeset patch
# User nikita@nikita-lab
# Date 1245518119 -7200
# Node ID 8ccdc5cc81e2d12a6806cf90b922218cdce0fc1a
# Parent  f9bbba863298a86c8764a56c1ea56d7503652f07
un segfault en moins, marseille avait enlevé mService a l'arrache dans
ContactDialiogAlias.java

diff -r f9bbba863298 -r 8ccdc5cc81e2 src/com/beem/project/beem/ui/ContactDialog.java
--- a/src/com/beem/project/beem/ui/ContactDialog.java	Sat Jun 20 18:52:15 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactDialog.java	Sat Jun 20 19:15:19 2009 +0200
@@ -58,7 +58,7 @@
 
 	    ContactDialogAliasDialog dialog = new ContactDialogAliasDialog(mContext, mContact);
 	    dialog.setOwnerActivity(ContactDialog.this.getOwnerActivity());
-	    dialog.initService();
+	    dialog.initService(xmppFacade);
 	    dialog.show();
 	}
 
diff -r f9bbba863298 -r 8ccdc5cc81e2 src/com/beem/project/beem/ui/ContactDialogAliasDialog.java
--- a/src/com/beem/project/beem/ui/ContactDialogAliasDialog.java	Sat Jun 20 18:52:15 2009 +0200
+++ b/src/com/beem/project/beem/ui/ContactDialogAliasDialog.java	Sat Jun 20 19:15:19 2009 +0200
@@ -3,15 +3,14 @@
  */
 package com.beem.project.beem.ui;
 
-import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.os.RemoteException;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 
-import com.beem.project.beem.BeemApplication;
 import com.beem.project.beem.R;
 import com.beem.project.beem.service.Contact;
 import com.beem.project.beem.service.aidl.IXmppFacade;
@@ -21,38 +20,38 @@
  */
 public class ContactDialogAliasDialog extends Dialog {
 
-    @SuppressWarnings("unused")
-    private String      mName;
-    private Contact     mContact;
-    private IXmppFacade mService;
+	protected static final String TAG = "CAlias";
+	//private String      mName;
+	private Contact     mContact;
+	private IXmppFacade mService;
 
-    public ContactDialogAliasDialog(Context context, Contact contact) {
-	super(context);
-	setContentView(R.layout.contactdialogaliasdialog);
-	setTitle("Alias");
-	mContact = contact;
-	EditText nameText = (EditText) findViewById(R.id.CDAliasDialogName);
-	nameText.setText(mContact.getName());
+	public ContactDialogAliasDialog(Context context, Contact contact) {
+		super(context);
+		setContentView(R.layout.contactdialogaliasdialog);
+		setTitle("Alias");
+		mContact = contact;
+		EditText nameText = (EditText) findViewById(R.id.CDAliasDialogName);
+		nameText.setText(mContact.getName());
 
-	Button ok = (Button) findViewById(R.id.CDAliasDialogOk);
-	ok.setOnClickListener(new View.OnClickListener() {
+		Button ok = (Button) findViewById(R.id.CDAliasDialogOk);
+		ok.setOnClickListener(new View.OnClickListener() {
 
-	    @Override
-	    public void onClick(View v) {
-		EditText nameText = (EditText) findViewById(R.id.CDAliasDialogName);
-		try {
-		    mService.getRoster().setContactName(mContact.getJID(), nameText.getText().toString());
-		} catch (RemoteException e) {
-		    e.printStackTrace();
-		}
-		dismiss();
-	    }
+			@Override
+			public void onClick(View v) {
+				EditText nameText = (EditText) findViewById(R.id.CDAliasDialogName);
+				try {
+					Log.d(TAG, mContact.getJID() + nameText.getText().toString());
+					mService.getRoster().setContactName(mContact.getJID(), nameText.getText().toString());
+				} catch (RemoteException e) {
+					e.printStackTrace();
+				}
+				dismiss();
+			}
 
-	});
-    }
+		});
+	}
 
-    public void initService() {
-	Activity a = ContactDialogAliasDialog.this.getOwnerActivity();
-	mService = BeemApplication.getApplication(a).getXmppFacade();
-    }
+	public void initService(IXmppFacade service) {
+		mService = service;
+	}
 }