--- a/res/layout/addcontact.xml Wed Apr 22 00:22:58 2009 +0200
+++ b/res/layout/addcontact.xml Wed Apr 22 19:47:30 2009 +0200
@@ -16,7 +16,7 @@
android:minWidth="70dp"
/>
- <EditText android:id="@+id/login"
+ <EditText android:id="@+id/AC_login"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
@@ -38,7 +38,7 @@
android:text="Alias:"
android:minWidth="70dp"
/>
- <EditText android:id="@+id/alias"
+ <EditText android:id="@+id/AC_alias"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
@@ -59,18 +59,17 @@
android:text="Group:"
android:minWidth="70dp"
/>
- <EditText android:id="@+id/group"
+ <EditText android:id="@+id/AC_group"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:password="true"
android:textSize="16sp"
android:autoText="false"
android:minWidth="250dp"
android:capitalize="none"
android:scrollHorizontally="true"/>
</LinearLayout>
- <Button android:id="@+id/ok"
+ <Button android:id="@+id/AC_ok"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
--- a/src/com/beem/project/beem/ui/AddContact.java Wed Apr 22 00:22:58 2009 +0200
+++ b/src/com/beem/project/beem/ui/AddContact.java Wed Apr 22 19:47:30 2009 +0200
@@ -3,6 +3,9 @@
*/
package com.beem.project.beem.ui;
+import java.util.ArrayList;
+import java.util.List;
+
import com.beem.project.beem.BeemApplication;
import com.beem.project.beem.R;
import com.beem.project.beem.service.aidl.IXmppFacade;
@@ -26,14 +29,14 @@
protected static final String TAG = "AddContact";
private String mLogin;
private String mAlias;
- private String[] mGroup;
+ private List<String> mGroup = new ArrayList<String>();
private IXmppFacade mService;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.addcontact);
- Button ok = (Button) findViewById(R.id.ok);
+ Button ok = (Button) findViewById(R.id.AC_ok);
//mAccountManager = new AccountManager();
ok.setOnClickListener(mOkListener);
mService = BeemApplication.getApplication(this).getXmppFacade();
@@ -44,27 +47,27 @@
@Override
public void onClick(View v) {
boolean valid = true;
- if (getWidgetText(R.id.login).length() != 0) {
+ if (getWidgetText(R.id.AC_login).length() == 0) {
Log.d(TAG, "login pas ok");
valid = false;
} else {
- mLogin = getWidgetText(R.id.login);
+ mLogin = getWidgetText(R.id.AC_login);
}
- if (getWidgetText(R.id.alias).length() != 0) {
+ if (getWidgetText(R.id.AC_alias).length() == 0) {
Log.d(TAG, "alias pas ok");
valid = false;
} else {
- mAlias = getWidgetText(R.id.alias);
+ mAlias = getWidgetText(R.id.AC_alias);
}
- if (getWidgetText(R.id.group).length() != 0) {
+ if (getWidgetText(R.id.AC_group).length() == 0) {
Log.d(TAG, "group pas ok");
valid = false;
} else {
- mGroup[0] = getWidgetText(R.id.group);
+ mGroup.add(getWidgetText(R.id.AC_group));
}
if (valid) {
try {
- mService.getRoster().addContact(mLogin, mAlias, mGroup);
+ mService.getRoster().addContact(mLogin, mAlias, (String[])mGroup.toArray(new String[mGroup.size()]));
Toast.makeText(AddContact.this, "Contact added",
Toast.LENGTH_SHORT).show();
finish();