# HG changeset patch # User Nikita Kozlov # Date 1253108292 -7200 # Node ID 13356aeb873c1aa165c43214eb152eb852adcbc1 # Parent dff3e3f715d98ef6c295df114db43f5773047847 pas mal de warnings en moins dans le service diff -r dff3e3f715d9 -r 13356aeb873c .classpath --- a/.classpath Sun Sep 06 23:36:49 2009 +0200 +++ b/.classpath Wed Sep 16 15:38:12 2009 +0200 @@ -11,8 +11,8 @@ + - diff -r dff3e3f715d9 -r 13356aeb873c default.properties --- a/default.properties Sun Sep 06 23:36:49 2009 +0200 +++ b/default.properties Wed Sep 16 15:38:12 2009 +0200 @@ -8,7 +8,7 @@ # project structure. # Project target. -target=Google Inc.:Google APIs:3 +target=android-3 # apk configurations. This property allows creation of APK files with limited # resources. For example, if your application contains many locales and # you wish to release multiple smaller apks instead of a large one, you can diff -r dff3e3f715d9 -r 13356aeb873c src/com/beem/project/beem/BeemService.java --- a/src/com/beem/project/beem/BeemService.java Sun Sep 06 23:36:49 2009 +0200 +++ b/src/com/beem/project/beem/BeemService.java Wed Sep 16 15:38:12 2009 +0200 @@ -121,7 +121,6 @@ @Override public void connectionClosed() throws RemoteException { Log.i("BeemService", "connectionClosed()"); - } @Override @@ -157,7 +156,7 @@ public void processPacket(Packet packet) { String from = packet.getFrom(); Notification notif = new Notification(com.beem.project.beem.R.drawable.signal, - "Demande d'ajout", System.currentTimeMillis()); + "Demande d'ajout", System.currentTimeMillis()); notif.defaults = Notification.DEFAULT_ALL; notif.flags = Notification.FLAG_AUTO_CANCEL; Intent intent = new Intent(BeemService.this, Subscription.class); diff -r dff3e3f715d9 -r 13356aeb873c src/com/beem/project/beem/provider/Beem.java --- a/src/com/beem/project/beem/provider/Beem.java Sun Sep 06 23:36:49 2009 +0200 +++ b/src/com/beem/project/beem/provider/Beem.java Wed Sep 16 15:38:12 2009 +0200 @@ -17,12 +17,12 @@ * The query used to create the table */ public final static String QUERY_CREATE = "CREATE TABLE " + Beem.CONTACTS_TABLE_NAME + " (" - + BaseColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," - + Contacts.UID + " INTEGER, " + Contacts.JID - + " INTEGER," + Contacts.NICKNAME + " TEXT," - + Contacts.ALIAS + " TEXT," + Contacts.DATE_CREATED - + " INTEGER," + Contacts.DATE_MODIFIED + " INTEGER" - + ");"; + + BaseColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," + + Contacts.UID + " INTEGER, " + Contacts.JID + + " INTEGER," + Contacts.NICKNAME + " TEXT," + + Contacts.ALIAS + " TEXT," + Contacts.DATE_CREATED + + " INTEGER," + Contacts.DATE_MODIFIED + " INTEGER" + + ");"; /** * The content:// style URL for Contacts table @@ -103,9 +103,9 @@ * The query used to create the table */ public final static String QUERY_CREATE = "CREATE TABLE " + Beem.USERS_TABLE_NAME + " (" - + BaseColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," - + Users.JUSERNAME + " TEXT," + Users.DATE_CREATED - + " INTEGER," + Users.DATE_MODIFIED + " INTEGER" + ");"; + + BaseColumns._ID + " INTEGER PRIMARY KEY AUTOINCREMENT," + + Users.JUSERNAME + " TEXT," + Users.DATE_CREATED + + " INTEGER," + Users.DATE_MODIFIED + " INTEGER" + ");"; /** * The content:// style URL for Contacts table diff -r dff3e3f715d9 -r 13356aeb873c src/com/beem/project/beem/provider/BeemDatabaseHelper.java --- a/src/com/beem/project/beem/provider/BeemDatabaseHelper.java Sun Sep 06 23:36:49 2009 +0200 +++ b/src/com/beem/project/beem/provider/BeemDatabaseHelper.java Wed Sep 16 15:38:12 2009 +0200 @@ -27,7 +27,7 @@ @Override public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { Log.w(this.mTag, "Upgrading database from version " + oldVersion + " to " + newVersion - + ", which will destroy all old data"); + + ", which will destroy all old data"); db.execSQL("DROP TABLE IF EXISTS " + this.mTableName + ";"); onCreate(db); } diff -r dff3e3f715d9 -r 13356aeb873c src/com/beem/project/beem/provider/ContactProvider.java --- a/src/com/beem/project/beem/provider/ContactProvider.java Sun Sep 06 23:36:49 2009 +0200 +++ b/src/com/beem/project/beem/provider/ContactProvider.java Wed Sep 16 15:38:12 2009 +0200 @@ -53,18 +53,18 @@ int count; switch (sUriMatcher.match(uri)) { - case CONTACTS: - count = db.delete(Beem.CONTACTS_TABLE_NAME, selection, selectionArgs); - break; + case CONTACTS: + count = db.delete(Beem.CONTACTS_TABLE_NAME, selection, selectionArgs); + break; - case CONTACT_ID: - String contactId = uri.getPathSegments().get(1); - count = db.delete(Beem.CONTACTS_TABLE_NAME, BaseColumns._ID + "=" + contactId + case CONTACT_ID: + String contactId = uri.getPathSegments().get(1); + count = db.delete(Beem.CONTACTS_TABLE_NAME, BaseColumns._ID + "=" + contactId + (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""), selectionArgs); - break; + break; - default: - throw new IllegalArgumentException("Unknown URI " + uri); + default: + throw new IllegalArgumentException("Unknown URI " + uri); } getContext().getContentResolver().notifyChange(uri, null); @@ -74,14 +74,14 @@ @Override public String getType(Uri uri) { switch (sUriMatcher.match(uri)) { - case CONTACTS: - return Beem.Contacts.CONTENT_TYPE; + case CONTACTS: + return Beem.Contacts.CONTENT_TYPE; - case CONTACT_ID: - return Beem.Contacts.CONTENT_ITEM_TYPE; + case CONTACT_ID: + return Beem.Contacts.CONTENT_ITEM_TYPE; - default: - throw new IllegalArgumentException("Unknown URI " + uri); + default: + throw new IllegalArgumentException("Unknown URI " + uri); } } @@ -149,19 +149,19 @@ SQLiteQueryBuilder qb = new SQLiteQueryBuilder(); switch (sUriMatcher.match(uri)) { - case CONTACTS: - qb.setTables(Beem.CONTACTS_TABLE_NAME); - qb.setProjectionMap(sContactsProjectionMap); - break; + case CONTACTS: + qb.setTables(Beem.CONTACTS_TABLE_NAME); + qb.setProjectionMap(sContactsProjectionMap); + break; - case CONTACT_ID: - qb.setTables(Beem.USERS_TABLE_NAME); - qb.setProjectionMap(sContactsProjectionMap); - qb.appendWhere(BaseColumns._ID + "=" + uri.getPathSegments().get(1)); - break; + case CONTACT_ID: + qb.setTables(Beem.USERS_TABLE_NAME); + qb.setProjectionMap(sContactsProjectionMap); + qb.appendWhere(BaseColumns._ID + "=" + uri.getPathSegments().get(1)); + break; - default: - throw new IllegalArgumentException("Unknown URI " + uri); + default: + throw new IllegalArgumentException("Unknown URI " + uri); } // If no sort order is specified use the default @@ -187,18 +187,18 @@ int count; switch (sUriMatcher.match(uri)) { - case CONTACTS: - count = db.update(Beem.CONTACTS_TABLE_NAME, values, selection, selectionArgs); - break; + case CONTACTS: + count = db.update(Beem.CONTACTS_TABLE_NAME, values, selection, selectionArgs); + break; - case CONTACT_ID: - String contactId = uri.getPathSegments().get(1); - count = db.update(Beem.CONTACTS_TABLE_NAME, values, BaseColumns._ID + "=" + contactId + case CONTACT_ID: + String contactId = uri.getPathSegments().get(1); + count = db.update(Beem.CONTACTS_TABLE_NAME, values, BaseColumns._ID + "=" + contactId + (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""), selectionArgs); - break; + break; - default: - throw new IllegalArgumentException("Unknown URI " + uri); + default: + throw new IllegalArgumentException("Unknown URI " + uri); } getContext().getContentResolver().notifyChange(uri, null); diff -r dff3e3f715d9 -r 13356aeb873c src/com/beem/project/beem/provider/UserProvider.java --- a/src/com/beem/project/beem/provider/UserProvider.java Sun Sep 06 23:36:49 2009 +0200 +++ b/src/com/beem/project/beem/provider/UserProvider.java Wed Sep 16 15:38:12 2009 +0200 @@ -44,18 +44,18 @@ int count; switch (sUriMatcher.match(uri)) { - case USERS: - count = db.delete(Beem.USERS_TABLE_NAME, selection, selectionArgs); - break; + case USERS: + count = db.delete(Beem.USERS_TABLE_NAME, selection, selectionArgs); + break; - case USER_ID: - String userID = uri.getPathSegments().get(1); - count = db.delete(Beem.USERS_TABLE_NAME, BaseColumns._ID + "=" + userID + case USER_ID: + String userID = uri.getPathSegments().get(1); + count = db.delete(Beem.USERS_TABLE_NAME, BaseColumns._ID + "=" + userID + (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""), selectionArgs); - break; + break; - default: - throw new IllegalArgumentException("Unknown URI " + uri); + default: + throw new IllegalArgumentException("Unknown URI " + uri); } getContext().getContentResolver().notifyChange(uri, null); @@ -65,14 +65,14 @@ @Override public String getType(Uri uri) { switch (sUriMatcher.match(uri)) { - case USERS: - return Beem.Users.CONTENT_TYPE; + case USERS: + return Beem.Users.CONTENT_TYPE; - case USER_ID: - return Beem.Users.CONTENT_ITEM_TYPE; + case USER_ID: + return Beem.Users.CONTENT_ITEM_TYPE; - default: - throw new IllegalArgumentException("Unknown URI " + uri); + default: + throw new IllegalArgumentException("Unknown URI " + uri); } } @@ -127,19 +127,19 @@ SQLiteQueryBuilder qb = new SQLiteQueryBuilder(); switch (sUriMatcher.match(uri)) { - case USERS: - qb.setTables(Beem.USERS_TABLE_NAME); - qb.setProjectionMap(sUsersProjectionMap); - break; + case USERS: + qb.setTables(Beem.USERS_TABLE_NAME); + qb.setProjectionMap(sUsersProjectionMap); + break; - case USER_ID: - qb.setTables(Beem.USERS_TABLE_NAME); - qb.setProjectionMap(sUsersProjectionMap); - qb.appendWhere(BaseColumns._ID + "=" + uri.getPathSegments().get(1)); - break; + case USER_ID: + qb.setTables(Beem.USERS_TABLE_NAME); + qb.setProjectionMap(sUsersProjectionMap); + qb.appendWhere(BaseColumns._ID + "=" + uri.getPathSegments().get(1)); + break; - default: - throw new IllegalArgumentException("Unknown URI " + uri); + default: + throw new IllegalArgumentException("Unknown URI " + uri); } // If no sort order is specified use the default @@ -165,18 +165,18 @@ int count; switch (sUriMatcher.match(uri)) { - case USERS: - count = db.update(Beem.USERS_TABLE_NAME, values, selection, selectionArgs); - break; + case USERS: + count = db.update(Beem.USERS_TABLE_NAME, values, selection, selectionArgs); + break; - case USER_ID: - String userId = uri.getPathSegments().get(1); - count = db.update(Beem.USERS_TABLE_NAME, values, BaseColumns._ID + "=" + userId + case USER_ID: + String userId = uri.getPathSegments().get(1); + count = db.update(Beem.USERS_TABLE_NAME, values, BaseColumns._ID + "=" + userId + (!TextUtils.isEmpty(selection) ? " AND (" + selection + ')' : ""), selectionArgs); - break; + break; - default: - throw new IllegalArgumentException("Unknown URI " + uri); + default: + throw new IllegalArgumentException("Unknown URI " + uri); } getContext().getContentResolver().notifyChange(uri, null); diff -r dff3e3f715d9 -r 13356aeb873c src/com/beem/project/beem/service/BeemChatManager.java --- a/src/com/beem/project/beem/service/BeemChatManager.java Sun Sep 06 23:36:49 2009 +0200 +++ b/src/com/beem/project/beem/service/BeemChatManager.java Wed Sep 16 15:38:12 2009 +0200 @@ -1,6 +1,3 @@ -/** - * - */ package com.beem.project.beem.service; import java.util.HashMap; @@ -66,7 +63,7 @@ } catch (RemoteException e) { // The RemoteCallbackList will take care of removing the // dead listeners. - Log.w(TAG, "Error while triggering remote connection listeners", e); + Log.w(TAG, " Error while triggering remote connection listeners in chat creation", e); } } mRemoteChatCreationListeners.finishBroadcast(); diff -r dff3e3f715d9 -r 13356aeb873c src/com/beem/project/beem/service/ChatAdapter.java --- a/src/com/beem/project/beem/service/ChatAdapter.java Sun Sep 06 23:36:49 2009 +0200 +++ b/src/com/beem/project/beem/service/ChatAdapter.java Wed Sep 16 15:38:12 2009 +0200 @@ -1,6 +1,3 @@ -/** - * - */ package com.beem.project.beem.service; import java.util.Collections; diff -r dff3e3f715d9 -r 13356aeb873c src/com/beem/project/beem/service/Message.java --- a/src/com/beem/project/beem/service/Message.java Sun Sep 06 23:36:49 2009 +0200 +++ b/src/com/beem/project/beem/service/Message.java Wed Sep 16 15:38:12 2009 +0200 @@ -1,6 +1,3 @@ -/** - * - */ package com.beem.project.beem.service; import org.jivesoftware.smack.packet.XMPPError; @@ -34,15 +31,6 @@ * Error message type. */ public static final int MSG_TYPE_ERROR = 400; - - private int mType; - private String mBody; - private String mSubject; - private String mTo; - private String mFrom; - private String mThread; - // TODO ajouter l'erreur - /** * Parcelable.Creator needs by Android. */ @@ -59,6 +47,15 @@ } }; + private int mType; + private String mBody; + private String mSubject; + private String mTo; + private String mFrom; + private String mThread; + // TODO ajouter l'erreur + + /** * Constructor. * @param to the destinataire of the message @@ -85,7 +82,7 @@ * Construct a message from a smack message packet. * @param smackMsg Smack message packet */ - public Message(org.jivesoftware.smack.packet.Message smackMsg) { + public Message(final org.jivesoftware.smack.packet.Message smackMsg) { this(smackMsg.getTo()); switch (smackMsg.getType()) { case chat: @@ -214,10 +211,10 @@ /** * Set the from field of the message. - * @param mFrom the mFrom to set + * @param from the mFrom to set */ - public void setFrom(String mFrom) { - this.mFrom = mFrom; + public void setFrom(String from) { + this.mFrom = from; } /** diff -r dff3e3f715d9 -r 13356aeb873c src/com/beem/project/beem/service/PresenceAdapter.java --- a/src/com/beem/project/beem/service/PresenceAdapter.java Sun Sep 06 23:36:49 2009 +0200 +++ b/src/com/beem/project/beem/service/PresenceAdapter.java Wed Sep 16 15:38:12 2009 +0200 @@ -8,32 +8,41 @@ import com.beem.project.beem.utils.PresenceType; import com.beem.project.beem.utils.Status; +/** + * this class contain contact presence informations. + * @author nikita + */ public class PresenceAdapter implements Parcelable { + /** + * Parcelable.Creator needs by Android. + */ + public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { + + @Override + public PresenceAdapter createFromParcel( + Parcel source) { + return new PresenceAdapter(source); + } + + @Override + public PresenceAdapter[] newArray(int size) { + return new PresenceAdapter[size]; + } + }; + private int mType; private int mStatus; private String mTo; private String mFrom; private String mStatusText; + /** - * Parcelable.Creator needs by Android. + * constructor from Parcel. + * @param source parcelable presence. */ - public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { - - @Override - public PresenceAdapter createFromParcel( - Parcel source) { - return new PresenceAdapter(source); - } - - @Override - public PresenceAdapter[] newArray(int size) { - return new PresenceAdapter[size]; - } - }; - - public PresenceAdapter(Parcel source) { + public PresenceAdapter(final Parcel source) { mType = source.readInt(); mStatus = source.readInt(); mTo = source.readString(); @@ -41,7 +50,11 @@ mStatusText = source.readString(); } - public PresenceAdapter(Presence presence) { + /** + * constructor from smack Presence. + * @param presence smack presence. + */ + public PresenceAdapter(final Presence presence) { mType = PresenceType.getPresenceType(presence); mStatus = Status.getStatusFromPresence(presence); mTo = presence.getTo(); @@ -56,6 +69,7 @@ } /** + * mFrom getter. * @return the mFrom */ public String getFrom() { @@ -63,6 +77,7 @@ } /** + * mStatus getter. * @return the mStatus */ public int getStatus() { @@ -70,6 +85,7 @@ } /** + * mStatusText getter. * @return the mStatusText */ public String getStatusText() { @@ -77,6 +93,7 @@ } /** + * mTo getter. * @return the mTo */ public String getTo() { @@ -84,6 +101,7 @@ } /** + * mType getter. * @return the mType */ public int getType() { @@ -91,43 +109,43 @@ } /** - * @param mFrom - * the mFrom to set + * mFrom setter. + * @param from the mFrom to set */ - public void setFrom(String mFrom) { - this.mFrom = mFrom; + public void setFrom(final String from) { + this.mFrom = from; } /** - * @param mStatus - * the mStatus to set + * mStatus setter. + * @param status the mStatus to set */ - public void setStatus(int mStatus) { - this.mStatus = mStatus; + public void setStatus(final int status) { + this.mStatus = status; } /** - * @param mStatusText - * the mStatusText to set + * mStatusText setter. + * @param statusText the mStatusText to set */ - public void setStatusText(String mStatusText) { - this.mStatusText = mStatusText; + public void setStatusText(final String statusText) { + this.mStatusText = statusText; } /** - * @param mTo - * the mTo to set + * mTo setter. + * @param to the mTo to set */ - public void setTo(String mTo) { - this.mTo = mTo; + public void setTo(final String to) { + this.mTo = to; } /** - * @param mType - * the mType to set + * mType setter. + * @param type the type to set */ - public void setType(int mType) { - this.mType = mType; + public void setType(int type) { + this.mType = type; } @Override diff -r dff3e3f715d9 -r 13356aeb873c src/com/beem/project/beem/service/PrivacyListManagerAdapter.java --- a/src/com/beem/project/beem/service/PrivacyListManagerAdapter.java Sun Sep 06 23:36:49 2009 +0200 +++ b/src/com/beem/project/beem/service/PrivacyListManagerAdapter.java Wed Sep 16 15:38:12 2009 +0200 @@ -1,6 +1,3 @@ -/** - * - */ package com.beem.project.beem.service; import java.util.ArrayList; @@ -19,27 +16,48 @@ import com.beem.project.beem.service.aidl.IPrivacyListManager; /** + * Privacy list manager in beem. * @author nikita - * A finir */ public class PrivacyListManagerAdapter extends IPrivacyListManager.Stub { + + /** + * Tag. + */ public static final String TAG = "PrivacyListManagerAdapter"; - private PrivacyListManager mAdaptee = null; + /** + * default privacy list name. + */ + public static final String DEFAULT_PRIVACYLIST = "default"; + + private PrivacyListManager mAdaptee; private List mBlockedUser = new ArrayList(); private XMPPConnection mConnection; private MyPrivacyListListener mPrivacyPacketListener = new MyPrivacyListListener(); - public PrivacyListManagerAdapter(XMPPConnection connection) { + /** + * Privacy list constructor. + * @param connection xmppconnection used. + */ + public PrivacyListManagerAdapter(final XMPPConnection connection) { mConnection = connection; mAdaptee = PrivacyListManager.getInstanceFor(mConnection); mAdaptee.addListener(mPrivacyPacketListener); } + /** + * return the blocked user list. + * @return blocked user list + */ public List getBlockedUsers() { return mBlockedUser; } - public synchronized void addBlockedUser(String jid) { + /** + * add an user to the blocked user list. + * @param jid blocked user jid + */ + public synchronized void addBlockedUser(final String jid) { if (mAdaptee == null) { mAdaptee = PrivacyListManager.getInstanceFor(mConnection); mAdaptee.addListener(mPrivacyPacketListener); @@ -47,7 +65,7 @@ List pItemList = new ArrayList(); PrivacyItem pItem = new PrivacyItem("jid", true, 1); pItem.setFilterMessage(true); - pItem.setValue(jid); + pItem.setValue(jid); pItemList.add(pItem); pItem = new PrivacyItem("subscription", true, 2); @@ -55,8 +73,8 @@ pItemList.add(pItem); try { - if (mAdaptee.getPrivacyList("default") == null) { - + if (mAdaptee.getPrivacyList(DEFAULT_PRIVACYLIST) == null) { + mAdaptee.createPrivacyList(DEFAULT_PRIVACYLIST, pItemList); } } catch (XMPPException e) { @@ -65,15 +83,15 @@ } catch (ClassCastException e) { e.printStackTrace(); try { - mAdaptee.createPrivacyList("default", pItemList); + mAdaptee.createPrivacyList(DEFAULT_PRIVACYLIST, pItemList); } catch (XMPPException e1) { // TODO Auto-generated catch block e1.printStackTrace(); } } try { - mAdaptee.setActiveListName("default"); - mAdaptee.setDefaultListName("default"); + mAdaptee.setActiveListName(DEFAULT_PRIVACYLIST); + mAdaptee.setDefaultListName(DEFAULT_PRIVACYLIST); } catch (XMPPException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -82,17 +100,26 @@ Log.d(TAG, "addBlockedUser"); } + /** + * privacy list listener. + * @author nikita + */ class MyPrivacyListListener implements PrivacyListListener { + /** + * constructor. + */ + public MyPrivacyListListener() { + } @Override public void setPrivacyList(String listName, List listItem) { - Log.d(TAG,"setPrivacyList"); + Log.d(TAG, "setPrivacyList"); } @Override public void updatedPrivacyList(String listName) { - Log.d(TAG,"updatedPrivacyList"); - } + Log.d(TAG, "updatedPrivacyList"); + } } @Override @@ -101,7 +128,11 @@ return null; } + /** + * adaptee getter. + * @return the current PrivacyListManager instance + */ public PrivacyListManager getManager() { return mAdaptee; - } + } } diff -r dff3e3f715d9 -r 13356aeb873c src/com/beem/project/beem/service/RosterAdapter.java --- a/src/com/beem/project/beem/service/RosterAdapter.java Sun Sep 06 23:36:49 2009 +0200 +++ b/src/com/beem/project/beem/service/RosterAdapter.java Wed Sep 16 15:38:12 2009 +0200 @@ -1,6 +1,3 @@ -/** - * - */ package com.beem.project.beem.service; @@ -295,7 +292,7 @@ } catch (RemoteException e) { // The RemoteCallbackList will take care of removing the // dead listeners. - Log.w(TAG, "Error while updating roster entries", e); + Log.w(TAG, "Error while updating roster entries presence", e); } } mRemoteRosListeners.finishBroadcast(); diff -r dff3e3f715d9 -r 13356aeb873c src/com/beem/project/beem/service/XmppConnectionAdapter.java --- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java Sun Sep 06 23:36:49 2009 +0200 +++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java Wed Sep 16 15:38:12 2009 +0200 @@ -213,8 +213,8 @@ /** * @param mPrivacyList the mPrivacyList to set */ - public void setPrivacyList(PrivacyListManagerAdapter mPrivacyList) { - this.mPrivacyList = mPrivacyList; + public void setPrivacyList(PrivacyListManagerAdapter privacyList) { + this.mPrivacyList = privacyList; } /** @@ -313,7 +313,7 @@ } catch (RemoteException e) { // The RemoteCallbackList will take care of removing the // dead listeners. - Log.w(TAG, "Error while triggering remote connection listeners", e); + Log.w(TAG, "Eror while triggering remote connection listeners", e); } } mRemoteConnListeners.finishBroadcast(); diff -r dff3e3f715d9 -r 13356aeb873c src/com/beem/project/beem/service/XmppFacade.java --- a/src/com/beem/project/beem/service/XmppFacade.java Sun Sep 06 23:36:49 2009 +0200 +++ b/src/com/beem/project/beem/service/XmppFacade.java Wed Sep 16 15:38:12 2009 +0200 @@ -18,7 +18,6 @@ /** * This class is a facade for the Beem Service. - * * @author darisk */ public class XmppFacade extends IXmppFacade.Stub { @@ -29,11 +28,9 @@ /** * Constructor for XMPPFacade. - * - * @param connection - * the connection use by the facade - * @param service - * the service which holds the facade + * @param connection the connection use by the facade + * @param service the service which holds the facade + * @param jingle the jingle session */ public XmppFacade(final XmppConnectionAdapter connection, final BeemService service, final JingleService jingle) { this.mConnexion = connection; @@ -55,14 +52,16 @@ mConnexion.getAdaptee().sendPacket(pres); Notification mStatusNotification; - String text = (msg == null ? "" : msg); + String text = ""; + if (msg != null) + text = msg; mStatusNotification = new Notification(com.beem.project.beem.R.drawable.notify_signal, text, System - .currentTimeMillis()); + .currentTimeMillis()); mStatusNotification.defaults = Notification.DEFAULT_ALL; mStatusNotification.flags = Notification.FLAG_NO_CLEAR; mStatusNotification.setLatestEventInfo(mBeemService, "Beem Status", text, PendingIntent.getActivity( - mBeemService, 0, new Intent(mBeemService, ChangeStatus.class), 0)); + mBeemService, 0, new Intent(mBeemService, ChangeStatus.class), 0)); mBeemService.sendNotification(BeemService.NOTIFICATION_STATUS_ID, mStatusNotification); } @@ -125,9 +124,9 @@ public void blockUser(String jid) throws RemoteException { mConnexion.getPrivacyList().addBlockedUser(jid); } - + @Override public void call(String jid) throws RemoteException { - mJingle.call(jid); + mJingle.call(jid); } }