--- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java Tue Dec 22 17:28:31 2009 +0100
+++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java Tue Dec 22 17:45:31 2009 +0100
@@ -76,7 +76,6 @@
import com.beem.project.beem.utils.BeemBroadcastReceiver;
import com.beem.project.beem.utils.Status;
-// TODO: Auto-generated Javadoc
/**
* This class implements an adapter for XMPPConnection.
* @author darisk
@@ -87,6 +86,8 @@
* Beem connection closed Intent name.
*/
+ private static final int SMACK_PRIORITY_MIN = -128;
+ private static final int SMACK_PRIORITY_MAX = 128;
private static final String TAG = "XMPPConnectionAdapter";
private final XMPPConnection mAdaptee;
private IChatManager mChatManager;
@@ -235,12 +236,11 @@
Presence.Mode mode = Status.getPresenceModeFromStatus(status);
if (mode != null)
pres.setMode(mode);
- // Smack limit : Priority between -128 and 128
int p = priority;
- if (priority < -128)
- p = -128;
- if (priority > 128)
- p = 128;
+ if (priority < SMACK_PRIORITY_MIN)
+ p = SMACK_PRIORITY_MIN;
+ if (priority > SMACK_PRIORITY_MAX)
+ p = SMACK_PRIORITY_MAX;
mPreviousPriority = p;
pres.setPriority(p);
mAdaptee.sendPacket(pres);
@@ -484,7 +484,7 @@
intent.putExtra("from", from);
notif.setLatestEventInfo(mService, from, mService
.getString(R.string.AcceptContactRequestFrom, from), PendingIntent.getActivity(mService, 0,
- intent, PendingIntent.FLAG_ONE_SHOT));
+ intent, PendingIntent.FLAG_ONE_SHOT));
int id = packet.hashCode();
mService.sendNotification(id, notif);
}
@@ -585,7 +585,7 @@
intent.putExtra("from", from);
notif.setLatestEventInfo(mService, from, mService
.getString(R.string.AcceptContactRequestFrom, from), PendingIntent.getActivity(mService, 0,
- intent, PendingIntent.FLAG_ONE_SHOT));
+ intent, PendingIntent.FLAG_ONE_SHOT));
int id = packet.hashCode();
mService.sendNotification(id, notif);
}
--- a/src/com/beem/project/beem/service/aidl/IPrivacyListListener.aidl Tue Dec 22 17:28:31 2009 +0100
+++ b/src/com/beem/project/beem/service/aidl/IPrivacyListListener.aidl Tue Dec 22 17:45:31 2009 +0100
@@ -1,3 +1,46 @@
+/*
+ BEEM is a videoconference application on the Android Platform.
+
+ Copyright (C) 2009 by Frederic-Charles Barthelery,
+ Jean-Manuel Da Silva,
+ Nikita Kozlov,
+ Philippe Lago,
+ Jean Baptiste Vergely,
+ Vincent Veronis.
+
+ This file is part of BEEM.
+
+ BEEM is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ BEEM is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with BEEM. If not, see <http://www.gnu.org/licenses/>.
+
+ Please send bug reports with examples or suggestions to
+ contact@beem-project.com or http://dev.beem-project.com/
+
+ Epitech, hereby disclaims all copyright interest in the program "Beem"
+ written by Frederic-Charles Barthelery,
+ Jean-Manuel Da Silva,
+ Nikita Kozlov,
+ Philippe Lago,
+ Jean Baptiste Vergely,
+ Vincent Veronis.
+
+ Nicolas Sadirac, November 26, 2009
+ President of Epitech.
+
+ Flavien Astraud, November 26, 2009
+ Head of the EIP Laboratory.
+
+*/
package com.beem.project.beem.service.aidl;
import com.beem.project.beem.service.PrivacyListItem;
--- a/src/com/beem/project/beem/service/aidl/IXmppFacade.aidl Tue Dec 22 17:28:31 2009 +0100
+++ b/src/com/beem/project/beem/service/aidl/IXmppFacade.aidl Tue Dec 22 17:45:31 2009 +0100
@@ -58,7 +58,7 @@
/**
* Get the roster of the user
- */
+ */
IRoster getRoster();
/**
--- a/src/com/beem/project/beem/service/package-info.java Tue Dec 22 17:28:31 2009 +0100
+++ b/src/com/beem/project/beem/service/package-info.java Tue Dec 22 17:45:31 2009 +0100
@@ -39,7 +39,9 @@
Flavien Astraud, November 26, 2009
Head of the EIP Laboratory.
-
*/
+/**
+ * This package contains all the class use by the service.
+ */
package com.beem.project.beem.service;