# HG changeset patch # User Nikita Kozlov # Date 1259944217 -3600 # Node ID 896533b277d54131722706e546b5d97b2c73ee8d # Parent 98442ee557bfba01647c485200b6c3b8e8080cac ajout des headers diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/BeemService.java --- a/src/com/beem/project/beem/BeemService.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/BeemService.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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; import org.jivesoftware.smack.ConnectionConfiguration; @@ -51,6 +94,7 @@ import com.beem.project.beem.service.XmppFacade; import com.beem.project.beem.service.aidl.IXmppFacade; +// TODO: Auto-generated Javadoc /** * This class is for the Beem service. The connection to the xmpp server will be made asynchronously when the service * will start. @@ -58,9 +102,7 @@ */ public class BeemService extends Service { - /** - * The id to use for status notification. - */ + /** The id to use for status notification. */ public static final int NOTIFICATION_STATUS_ID = 100; private static final String TAG = "BeemService"; @@ -127,6 +169,9 @@ return mBind; } + /* (non-Javadoc) + * @see android.app.Service#onUnbind(android.content.Intent) + */ @Override public boolean onUnbind(Intent intent) { Log.d(TAG, "ONUNBIND()"); @@ -269,12 +314,11 @@ pm.addExtensionProvider("x", "jabber:x:event", new MessageEventProvider()); // Chat State pm.addExtensionProvider("active", "http://jabber.org/protocol/chatstates", new ChatStateExtension.Provider()); - pm.addExtensionProvider("composing", "http://jabber.org/protocol/chatstates", - new ChatStateExtension.Provider()); + pm + .addExtensionProvider("composing", "http://jabber.org/protocol/chatstates", + new ChatStateExtension.Provider()); pm.addExtensionProvider("paused", "http://jabber.org/protocol/chatstates", new ChatStateExtension.Provider()); - pm - .addExtensionProvider("inactive", "http://jabber.org/protocol/chatstates", - new ChatStateExtension.Provider()); + pm.addExtensionProvider("inactive", "http://jabber.org/protocol/chatstates", new ChatStateExtension.Provider()); pm.addExtensionProvider("gone", "http://jabber.org/protocol/chatstates", new ChatStateExtension.Provider()); // XHTML pm.addExtensionProvider("html", "http://jabber.org/protocol/xhtml-im", new XHTMLExtensionProvider()); diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/jingle/JingleService.java --- a/src/com/beem/project/beem/jingle/JingleService.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/jingle/JingleService.java Fri Dec 04 17:30:17 2009 +0100 @@ -1,6 +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 Véronis. + + 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 . + + 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.jingle; import java.util.ArrayList; @@ -20,6 +60,7 @@ import android.util.Log; +// TODO: Auto-generated Javadoc /** * Beem Jingle Service, manage jingle call. * @author nikita diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/jingle/MicrophoneRTPManager.java --- a/src/com/beem/project/beem/jingle/MicrophoneRTPManager.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/jingle/MicrophoneRTPManager.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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.jingle; import java.util.ArrayList; @@ -10,14 +53,14 @@ import org.jivesoftware.smackx.jingle.nat.JingleTransportManager; import org.jivesoftware.smackx.jingle.nat.TransportCandidate; +// TODO: Auto-generated Javadoc /** * RTPMediaManager, gere les payloads et renvoie une session RTP. * @author nikita */ public class MicrophoneRTPManager extends JingleMediaManager { - /** - * RTP media name. - */ + + /** RTP media name. */ public static final String MEDIA_NAME = "Microphone"; private List mPayloads; @@ -32,6 +75,9 @@ setupPayloads(); } + /* (non-Javadoc) + * @see org.jivesoftware.smackx.jingle.media.JingleMediaManager#createMediaSession(org.jivesoftware.smackx.jingle.media.PayloadType, org.jivesoftware.smackx.jingle.nat.TransportCandidate, org.jivesoftware.smackx.jingle.nat.TransportCandidate, org.jivesoftware.smackx.jingle.JingleSession) + */ @Override public JingleMediaSession createMediaSession(PayloadType payloadType, TransportCandidate remote, TransportCandidate local, JingleSession jingleSession) { @@ -39,11 +85,17 @@ return new MicrophoneRTPSession(payloadType, remote, local, null, jingleSession); } + /* (non-Javadoc) + * @see org.jivesoftware.smackx.jingle.media.JingleMediaManager#getName() + */ @Override public String getName() { return MEDIA_NAME; } + /* (non-Javadoc) + * @see org.jivesoftware.smackx.jingle.media.JingleMediaManager#getPayloads() + */ @Override public List getPayloads() { // TODO Auto-generated method stub diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/jingle/MicrophoneRTPSession.java --- a/src/com/beem/project/beem/jingle/MicrophoneRTPSession.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/jingle/MicrophoneRTPSession.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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.jingle; import org.jivesoftware.smackx.jingle.JingleSession; @@ -5,6 +48,7 @@ import org.jivesoftware.smackx.jingle.media.PayloadType; import org.jivesoftware.smackx.jingle.nat.TransportCandidate; +// TODO: Auto-generated Javadoc /** * Manage microphone RTP session. * @author nikita @@ -32,26 +76,41 @@ // mReceiver = new MicroRTPReceiver(getLocal().getPort()); } + /* (non-Javadoc) + * @see org.jivesoftware.smackx.jingle.media.JingleMediaSession#initialize() + */ @Override public void initialize() { // TODO Auto-generated method stub } + /* (non-Javadoc) + * @see org.jivesoftware.smackx.jingle.media.JingleMediaSession#setTrasmit(boolean) + */ @Override public void setTrasmit(boolean active) { } + /* (non-Javadoc) + * @see org.jivesoftware.smackx.jingle.media.JingleMediaSession#startReceive() + */ @Override public void startReceive() { } + /* (non-Javadoc) + * @see org.jivesoftware.smackx.jingle.media.JingleMediaSession#startTrasmit() + */ @Override public void startTrasmit() { } + /* (non-Javadoc) + * @see org.jivesoftware.smackx.jingle.media.JingleMediaSession#stopReceive() + */ @Override public void stopReceive() { if (mReceiver != null) { @@ -59,6 +118,9 @@ } } + /* (non-Javadoc) + * @see org.jivesoftware.smackx.jingle.media.JingleMediaSession#stopTrasmit() + */ @Override public void stopTrasmit() { if (mTransmitter != null) { diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/jingle/PCMTransmitter.java --- a/src/com/beem/project/beem/jingle/PCMTransmitter.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/jingle/PCMTransmitter.java Fri Dec 04 17:30:17 2009 +0100 @@ -1,9 +1,53 @@ +/** + 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 Véronis. + + 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 . + + 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.jingle; import android.media.AudioFormat; import android.media.AudioRecord; import android.media.MediaRecorder; +// TODO: Auto-generated Javadoc /** * Transmit Microphone data through RTP. * @author nikita @@ -23,6 +67,9 @@ super(remoteIP, remotePort); } + /* (non-Javadoc) + * @see com.beem.project.beem.jingle.RTPTransmitter#start() + */ @Override void start() { AudioRecord audRec = new AudioRecord(MediaRecorder.AudioSource.DEFAULT, RATE_IN_HZ, diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/jingle/RTPReceiver.java --- a/src/com/beem/project/beem/jingle/RTPReceiver.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/jingle/RTPReceiver.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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.jingle; import java.net.DatagramSocket; @@ -7,6 +50,7 @@ import org.jlibrtp.jlibrtp.RTPAppIntf; import org.jlibrtp.jlibrtp.RTPSession; +// TODO: Auto-generated Javadoc /** * abstract RTP receiver class. * @author nikita @@ -34,11 +78,17 @@ mRtpSession.RTPSessionRegister(this, null, null); } + /* (non-Javadoc) + * @see org.jlibrtp.jlibrtp.RTPAppIntf#frameSize(int) + */ @Override public int frameSize(int payloadType) { return 1; } + /* (non-Javadoc) + * @see java.lang.Runnable#run() + */ @Override public void run() { start(); @@ -57,6 +107,9 @@ this.setKillme(true); } + /* (non-Javadoc) + * @see org.jlibrtp.jlibrtp.RTPAppIntf#userEvent(int, org.jlibrtp.jlibrtp.Participant[]) + */ @Override public void userEvent(int arg0, Participant[] arg1) { // TODO Auto-generated method stub diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/jingle/RTPTransmitter.java --- a/src/com/beem/project/beem/jingle/RTPTransmitter.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/jingle/RTPTransmitter.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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.jingle; import java.net.DatagramSocket; @@ -10,6 +53,7 @@ import com.beem.project.beem.utils.FreePort; +// TODO: Auto-generated Javadoc /** * abstract RTP transmitter class. * @author nikita @@ -46,16 +90,25 @@ getRtpSession().addParticipant(new Participant(remoteIP, remotePort, 0)); } + /* (non-Javadoc) + * @see org.jlibrtp.jlibrtp.RTPAppIntf#frameSize(int) + */ @Override public int frameSize(int payloadType) { return 1; } + /* (non-Javadoc) + * @see org.jlibrtp.jlibrtp.RTPAppIntf#receiveData(org.jlibrtp.jlibrtp.DataFrame, org.jlibrtp.jlibrtp.Participant) + */ @Override public void receiveData(DataFrame frame, Participant participant) { // On envoie uniquement } + /* (non-Javadoc) + * @see java.lang.Runnable#run() + */ @Override public void run() { start(); @@ -73,6 +126,9 @@ mKillme = true; } + /* (non-Javadoc) + * @see org.jlibrtp.jlibrtp.RTPAppIntf#userEvent(int, org.jlibrtp.jlibrtp.Participant[]) + */ @Override public void userEvent(int type, Participant[] participant) { // je sais pas ce que c'est diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/jingle/demo/JingleCallActivity.java --- a/src/com/beem/project/beem/jingle/demo/JingleCallActivity.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/jingle/demo/JingleCallActivity.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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.jingle.demo; import org.jivesoftware.smack.ConnectionConfiguration; @@ -17,6 +60,7 @@ import com.beem.project.beem.R; import com.beem.project.beem.jingle.JingleService; +// TODO: Auto-generated Javadoc /** * Activity used to test Jingle call. * @author darisk @@ -42,6 +86,9 @@ public JingleCallActivity() { } + /* (non-Javadoc) + * @see android.app.Activity#onCreate(android.os.Bundle) + */ @Override protected void onCreate(Bundle savedInstanceState) { java.security.Security.addProvider(new com.sun.security.sasl.Provider()); diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/jingle/demo/package-info.java --- a/src/com/beem/project/beem/jingle/demo/package-info.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/jingle/demo/package-info.java Fri Dec 04 17:30:17 2009 +0100 @@ -1,5 +1,45 @@ /** - * Package for testing the Jingle classes. - */ + 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 Véronis. + + 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 . + + 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.jingle.demo; diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/jingle/package-info.java --- a/src/com/beem/project/beem/jingle/package-info.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/jingle/package-info.java Fri Dec 04 17:30:17 2009 +0100 @@ -1,5 +1,45 @@ /** - * This package contains the class used by the Beem Jingle process. - */ + 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 Véronis. + + 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 . + + 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.jingle; diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/package-info.java --- a/src/com/beem/project/beem/package-info.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/package-info.java Fri Dec 04 17:30:17 2009 +0100 @@ -1,5 +1,45 @@ /** - * This package contains the main class for the Beem application. - */ + 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 Véronis. + + 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 . + + 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; diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/provider/Beem.java --- a/src/com/beem/project/beem/provider/Beem.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/provider/Beem.java Fri Dec 04 17:30:17 2009 +0100 @@ -1,8 +1,52 @@ +/** + 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 Véronis. + + 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 . + + 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.provider; import android.net.Uri; import android.provider.BaseColumns; +// TODO: Auto-generated Javadoc /** * Convenience definitions for BEEM's providers. */ @@ -13,86 +57,76 @@ */ public static final class Contacts implements BaseColumns { - /** - * The query used to create the table. - */ + /** The query used to create the table. */ public static final 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" + ");"; - /** - * The content:// style URL for Contacts table. - */ + /** The content:// style URL for Contacts table. */ public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/contacts"); - /** - * The MIME type of {@link #CONTENT_URI} providing a directory of contacts. - */ + /** The MIME type of {@link #CONTENT_URI} providing a directory of contacts. */ public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.beem.project.contact"; - /** - * The MIME type of a {@link #CONTENT_URI} sub-directory of a single contact. - */ + /** The MIME type of a {@link #CONTENT_URI} sub-directory of a single contact. */ public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.beem.project.contact"; - /** - * The default sort order for this table. - */ + /** The default sort order for this table. */ public static final String DEFAULT_SORT_ORDER = "nickname ASC"; /** - * The user id having the contact - *

- * Type: INTEGER - *

- * . - */ + * The user id having the contact + *

+ * Type: INTEGER + *

+ * . + */ public static final String UID = "uid"; /** - * The JabberID of the contact - *

- * Type: INTEGER - *

- * . - */ + * The JabberID of the contact + *

+ * Type: INTEGER + *

+ * . + */ public static final String JID = "jid"; /** - * The nickname of the contact - *

- * Type: TEXT - *

- * . - */ + * The nickname of the contact + *

+ * Type: TEXT + *

+ * . + */ public static final String NICKNAME = "nickname"; /** - * The alias of the contact - *

- * Type: TEXT - *

- * . - */ + * The alias of the contact + *

+ * Type: TEXT + *

+ * . + */ public static final String ALIAS = "alias"; /** - * The timestamp for when the contact was created - *

- * Type: INTEGER (long from System.curentTimeMillis()) - *

- * . - */ + * The timestamp for when the contact was created + *

+ * Type: INTEGER (long from System.curentTimeMillis()) + *

+ * . + */ public static final String DATE_CREATED = "created"; /** - * The timestamp for when the contact was last modified - *

- * Type: INTEGER (long from System.curentTimeMillis()) - *

- * . - */ + * The timestamp for when the contact was last modified + *

+ * Type: INTEGER (long from System.curentTimeMillis()) + *

+ * . + */ public static final String DATE_MODIFIED = "modified"; } @@ -102,84 +136,64 @@ */ public static final class Users implements BaseColumns { - /** - * The query used to create the table. - */ + /** The query used to create the table. */ public static final 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" + ");"; - /** - * The content:// style URL for Contacts table. - */ + /** The content:// style URL for Contacts table. */ public static final Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY + "/users"); - /** - * The MIME type of {@link #CONTENT_URI} providing a directory of users. - */ + /** The MIME type of {@link #CONTENT_URI} providing a directory of users. */ public static final String CONTENT_TYPE = "vnd.android.cursor.dir/vnd.beem.project.user"; - /** - * The MIME type of a {@link #CONTENT_URI} sub-directory of a single user. - */ + /** The MIME type of a {@link #CONTENT_URI} sub-directory of a single user. */ public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/vnd.beem.project.user"; - /** - * The default sort order for this table. - */ + /** The default sort order for this table. */ public static final String DEFAULT_SORT_ORDER = "_id ASC"; /** - * The Jabber username of the user - *

- * Type: TEXT - *

- * . - */ + * The Jabber username of the user + *

+ * Type: TEXT + *

+ * . + */ public static final String JUSERNAME = "username"; /** - * The timestamp for when the user was created - *

- * Type: INTEGER (long from System.curentTimeMillis()) - *

- * . - */ + * The timestamp for when the user was created + *

+ * Type: INTEGER (long from System.curentTimeMillis()) + *

+ * . + */ public static final String DATE_CREATED = "created"; /** - * The timestamp for when the user was last modified - *

- * Type: INTEGER (long from System.curentTimeMillis()) - *

- * . - */ + * The timestamp for when the user was last modified + *

+ * Type: INTEGER (long from System.curentTimeMillis()) + *

+ * . + */ public static final String DATE_MODIFIED = "modified"; } - /** - * AUTHORITY. - */ + /** AUTHORITY. */ public static final String AUTHORITY = "com.beem.project.provider"; - /** - * DB Name. - */ + /** DB Name. */ public static final String DB_NAME = "beem.db"; - /** - * DB Version. - */ + /** DB Version. */ public static final int DB_VERSION = 2; - /** - * Name of the users table. - */ + /** Name of the users table. */ public static final String USERS_TABLE_NAME = "users"; - /** - * Name of the contacts table. - */ + /** Name of the contacts table. */ public static final String CONTACTS_TABLE_NAME = "contacts"; /** diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/provider/BeemDatabaseHelper.java --- a/src/com/beem/project/beem/provider/BeemDatabaseHelper.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/provider/BeemDatabaseHelper.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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.provider; import android.content.Context; @@ -5,6 +48,7 @@ import android.database.sqlite.SQLiteOpenHelper; import android.util.Log; +// TODO: Auto-generated Javadoc /** * BeemDatabaseHelper class. * @author Jamu @@ -31,11 +75,17 @@ this.mCreationQuery = creationQuery; } + /* (non-Javadoc) + * @see android.database.sqlite.SQLiteOpenHelper#onCreate(android.database.sqlite.SQLiteDatabase) + */ @Override public void onCreate(SQLiteDatabase db) { db.execSQL(this.mCreationQuery); } + /* (non-Javadoc) + * @see android.database.sqlite.SQLiteOpenHelper#onUpgrade(android.database.sqlite.SQLiteDatabase, int, int) + */ @Override public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { Log.w(this.mTag, "Upgrading database from version " + oldVersion + " to " + newVersion diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/provider/ContactProvider.java --- a/src/com/beem/project/beem/provider/ContactProvider.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/provider/ContactProvider.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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.provider; import java.util.HashMap; @@ -14,6 +57,7 @@ import android.provider.BaseColumns; import android.text.TextUtils; +// TODO: Auto-generated Javadoc /** * ContactProvider class. * @author dasilvj @@ -45,6 +89,9 @@ private BeemDatabaseHelper mOpenHelper; + /* (non-Javadoc) + * @see android.content.ContentProvider#delete(android.net.Uri, java.lang.String, java.lang.String[]) + */ @Override public int delete(Uri uri, String selection, String[] selectionArgs) { SQLiteDatabase db = mOpenHelper.getWritableDatabase(); @@ -69,6 +116,9 @@ return count; } + /* (non-Javadoc) + * @see android.content.ContentProvider#getType(android.net.Uri) + */ @Override public String getType(Uri uri) { switch (S_URI_MATCHER.match(uri)) { @@ -83,6 +133,9 @@ } } + /* (non-Javadoc) + * @see android.content.ContentProvider#insert(android.net.Uri, android.content.ContentValues) + */ @Override public Uri insert(Uri uri, ContentValues initialValues) { // Validate the requested uri @@ -136,12 +189,18 @@ throw new SQLException("Failed to insert row into " + uri); } + /* (non-Javadoc) + * @see android.content.ContentProvider#onCreate() + */ @Override public boolean onCreate() { mOpenHelper = new BeemDatabaseHelper(getContext(), TAG, Beem.CONTACTS_TABLE_NAME, Beem.Contacts.QUERY_CREATE); return true; } + /* (non-Javadoc) + * @see android.content.ContentProvider#query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String) + */ @Override public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { SQLiteQueryBuilder qb = new SQLiteQueryBuilder(); @@ -180,6 +239,9 @@ return c; } + /* (non-Javadoc) + * @see android.content.ContentProvider#update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]) + */ @Override public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) { SQLiteDatabase db = mOpenHelper.getWritableDatabase(); diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/provider/UserProvider.java --- a/src/com/beem/project/beem/provider/UserProvider.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/provider/UserProvider.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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.provider; import java.util.HashMap; @@ -14,6 +57,7 @@ import android.provider.BaseColumns; import android.text.TextUtils; +// TODO: Auto-generated Javadoc /** * UserProvider class. * @author Jamu @@ -42,6 +86,9 @@ private BeemDatabaseHelper mOpenHelper; + /* (non-Javadoc) + * @see android.content.ContentProvider#delete(android.net.Uri, java.lang.String, java.lang.String[]) + */ @Override public int delete(Uri uri, String selection, String[] selectionArgs) { SQLiteDatabase db = mOpenHelper.getWritableDatabase(); @@ -66,6 +113,9 @@ return count; } + /* (non-Javadoc) + * @see android.content.ContentProvider#getType(android.net.Uri) + */ @Override public String getType(Uri uri) { switch (S_URI_MATCHER.match(uri)) { @@ -80,6 +130,9 @@ } } + /* (non-Javadoc) + * @see android.content.ContentProvider#insert(android.net.Uri, android.content.ContentValues) + */ @Override public Uri insert(Uri uri, ContentValues initialValues) { // Validate the requested uri @@ -120,12 +173,18 @@ throw new SQLException("Failed to insert row into " + uri); } + /* (non-Javadoc) + * @see android.content.ContentProvider#onCreate() + */ @Override public boolean onCreate() { mOpenHelper = new BeemDatabaseHelper(getContext(), TAG, Beem.USERS_TABLE_NAME, Beem.Users.QUERY_CREATE); return true; } + /* (non-Javadoc) + * @see android.content.ContentProvider#query(android.net.Uri, java.lang.String[], java.lang.String, java.lang.String[], java.lang.String) + */ @Override public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) { SQLiteQueryBuilder qb = new SQLiteQueryBuilder(); @@ -164,6 +223,9 @@ return c; } + /* (non-Javadoc) + * @see android.content.ContentProvider#update(android.net.Uri, android.content.ContentValues, java.lang.String, java.lang.String[]) + */ @Override public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) { SQLiteDatabase db = mOpenHelper.getWritableDatabase(); diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/provider/package-info.java --- a/src/com/beem/project/beem/provider/package-info.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/provider/package-info.java Fri Dec 04 17:30:17 2009 +0100 @@ -1,5 +1,45 @@ /** - * This package contains the class concerning the providers of Beem. - */ + 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 Véronis. + + 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 . + + 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.provider; diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/service/BeemChatManager.java --- a/src/com/beem/project/beem/service/BeemChatManager.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/service/BeemChatManager.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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; import java.util.ArrayList; @@ -29,6 +72,7 @@ import com.beem.project.beem.service.aidl.IMessageListener; import com.beem.project.beem.service.aidl.IRoster; +// TODO: Auto-generated Javadoc /** * An adapter for smack's ChatManager. This class provides functionnality to handle chats. * @author darisk @@ -155,9 +199,7 @@ } } - /** - * Tag to use with log methods. - */ + /** Tag to use with log methods. */ public static final String TAG = "BeemChatManager"; private final ChatManager mAdaptee; private final Map mChats = new HashMap(); @@ -224,6 +266,9 @@ Log.d(TAG, "END destroyChat - jid = " + chat.getParticipant().getJID()); } + /* (non-Javadoc) + * @see com.beem.project.beem.service.aidl.IChatManager#deleteChatNotification(com.beem.project.beem.service.aidl.IChat) + */ @Override public void deleteChatNotification(IChat chat) { mService.deleteNotification(chat.hashCode()); @@ -254,7 +299,7 @@ IRoster mRoster = mService.getBind().getRoster(); for (ChatAdapter chat : mChats.values()) { - if (chat.getMessages().size() > 0) //TODO check plutot le nombre de messages dans l'historique + if (chat.getMessages().size() > 0) // TODO check plutot le nombre de messages dans l'historique openedChats.add(mRoster.getContact(chat.getParticipant().getJID())); } return openedChats; diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/service/ChatAdapter.java --- a/src/com/beem/project/beem/service/ChatAdapter.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/service/ChatAdapter.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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; import java.util.Collections; @@ -11,6 +54,7 @@ import com.beem.project.beem.service.aidl.IChat; +// TODO: Auto-generated Javadoc /** * An adapter for smack's Chat class. * @author darisk diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/service/Contact.java --- a/src/com/beem/project/beem/service/Contact.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/service/Contact.java Fri Dec 04 17:30:17 2009 +0100 @@ -1,6 +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 Véronis. + + 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 . + + 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; import java.util.ArrayList; @@ -17,15 +57,14 @@ import com.beem.project.beem.utils.Status; +// TODO: Auto-generated Javadoc /** * This class contains informations on a jabber contact. * @author darisk */ public class Contact implements Parcelable { - /** - * Parcelable.Creator needs by Android. - */ + /** Parcelable.Creator needs by Android. */ public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { @Override diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/service/Message.java --- a/src/com/beem/project/beem/service/Message.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/service/Message.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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; import org.jivesoftware.smack.packet.XMPPError; @@ -6,34 +49,26 @@ import android.os.Parcelable; import android.util.Log; +// TODO: Auto-generated Javadoc /** * This class represents a instant message. * @author darisk */ public class Message implements Parcelable { - /** - * Normal message type. Theese messages are like an email, with subject. - */ + /** Normal message type. Theese messages are like an email, with subject. */ public static final int MSG_TYPE_NORMAL = 100; - /** - * Chat message type. - */ + /** Chat message type. */ public static final int MSG_TYPE_CHAT = 200; - /** - * Group chat message type. - */ + /** Group chat message type. */ public static final int MSG_TYPE_GROUP_CHAT = 300; - /** - * Error message type. - */ + /** Error message type. */ public static final int MSG_TYPE_ERROR = 400; - /** - * Parcelable.Creator needs by Android. - */ + + /** Parcelable.Creator needs by Android. */ public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { @Override diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/service/PresenceAdapter.java --- a/src/com/beem/project/beem/service/PresenceAdapter.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/service/PresenceAdapter.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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; import org.jivesoftware.smack.packet.Presence; @@ -8,15 +51,14 @@ import com.beem.project.beem.utils.PresenceType; import com.beem.project.beem.utils.Status; +// TODO: Auto-generated Javadoc /** * this class contain contact presence informations. * @author nikita */ public class PresenceAdapter implements Parcelable { - /** - * Parcelable.Creator needs by Android. - */ + /** Parcelable.Creator needs by Android. */ public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { @Override @@ -60,6 +102,9 @@ mStatusText = presence.getStatus(); } + /* (non-Javadoc) + * @see android.os.Parcelable#describeContents() + */ @Override public int describeContents() { // TODO Auto-generated method stub @@ -146,6 +191,9 @@ this.mType = type; } + /* (non-Javadoc) + * @see android.os.Parcelable#writeToParcel(android.os.Parcel, int) + */ @Override public void writeToParcel(Parcel dest, int flags) { dest.writeInt(mType); diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/service/PrivacyListItem.java --- a/src/com/beem/project/beem/service/PrivacyListItem.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/service/PrivacyListItem.java Fri Dec 04 17:30:17 2009 +0100 @@ -1,8 +1,52 @@ +/** + 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 Véronis. + + 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 . + + 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; import android.os.Parcel; import android.os.Parcelable; +// TODO: Auto-generated Javadoc /** * A simplified version of the Smack PrivacyItem class. * @author Jean-Manuel Da Silva diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/service/PrivacyListManagerAdapter.java --- a/src/com/beem/project/beem/service/PrivacyListManagerAdapter.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/service/PrivacyListManagerAdapter.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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; import java.util.ArrayList; @@ -17,15 +60,14 @@ import com.beem.project.beem.service.aidl.IPrivacyListListener; import com.beem.project.beem.service.aidl.IPrivacyListManager; +// TODO: Auto-generated Javadoc /** * An adapter for the Smack's PrivacyListManager. * @author Jean-Manuel Da Silva */ public class PrivacyListManagerAdapter extends IPrivacyListManager.Stub { - /** - * Class's Tag. - */ + /** Class's Tag. */ public static final String TAG = "PrivacyListManagerAdapter"; private final PrivacyListManager mPrivacyListManager; @@ -35,17 +77,23 @@ /** * Constructor. - * @param connection The XMPP connection that will be used by the PrivacyListManagerAdapter. + * @param privacyListManager the privacy list manager */ public PrivacyListManagerAdapter(final PrivacyListManager privacyListManager) { mPrivacyListManager = privacyListManager; mPrivacyListManager.addListener(mPrivacyListListener); } + /* (non-Javadoc) + * @see com.beem.project.beem.service.aidl.IPrivacyListManager#blockUser(java.lang.String, java.lang.String) + */ @Override public void blockUser(String listName, String jid) throws RemoteException { } + /* (non-Javadoc) + * @see com.beem.project.beem.service.aidl.IPrivacyListManager#createPrivacyList(java.lang.String, java.util.List) + */ @Override public void createPrivacyList(String listName, List items) throws RemoteException { Log.d(TAG, "BEGIN createPrivacyList."); @@ -63,6 +111,9 @@ Log.d(TAG, "END createPrivacyList."); } + /* (non-Javadoc) + * @see com.beem.project.beem.service.aidl.IPrivacyListManager#declineActivePrivacyList() + */ @Override public void declineActivePrivacyList() throws RemoteException { try { @@ -72,6 +123,9 @@ } } + /* (non-Javadoc) + * @see com.beem.project.beem.service.aidl.IPrivacyListManager#declineDefaultPrivacyList() + */ @Override public void declineDefaultPrivacyList() throws RemoteException { try { @@ -81,6 +135,9 @@ } } + /* (non-Javadoc) + * @see com.beem.project.beem.service.aidl.IPrivacyListManager#editPrivacyList(java.lang.String, java.util.List) + */ @Override public void editPrivacyList(String listName, List items) throws RemoteException { Log.d(TAG, "BEGIN editPrivacyList."); @@ -92,6 +149,9 @@ Log.d(TAG, "END editPrivacyList."); } + /* (non-Javadoc) + * @see com.beem.project.beem.service.aidl.IPrivacyListManager#getActivePrivacyList() + */ @Override public String getActivePrivacyList() throws RemoteException { try { @@ -103,6 +163,9 @@ return null; } + /* (non-Javadoc) + * @see com.beem.project.beem.service.aidl.IPrivacyListManager#getBlockedGroupsByList(java.lang.String) + */ @Override public List getBlockedGroupsByList(String listName) throws RemoteException { List blockedGroups = new ArrayList(); @@ -118,6 +181,9 @@ return blockedGroups; } + /* (non-Javadoc) + * @see com.beem.project.beem.service.aidl.IPrivacyListManager#getBlockedUsersByList(java.lang.String) + */ @Override public List getBlockedUsersByList(String listName) throws RemoteException { List blockedUsers = new ArrayList(); @@ -133,6 +199,9 @@ return blockedUsers; } + /* (non-Javadoc) + * @see com.beem.project.beem.service.aidl.IPrivacyListManager#getDefaultPrivacyList() + */ @Override public String getDefaultPrivacyList() throws RemoteException { try { @@ -144,6 +213,9 @@ return null; } + /* (non-Javadoc) + * @see com.beem.project.beem.service.aidl.IPrivacyListManager#removePrivacyList(java.lang.String) + */ @Override public void removePrivacyList(String listName) throws RemoteException { try { @@ -153,6 +225,9 @@ } } + /* (non-Javadoc) + * @see com.beem.project.beem.service.aidl.IPrivacyListManager#setActivePrivacyList(java.lang.String) + */ @Override public void setActivePrivacyList(String listName) throws RemoteException { try { @@ -162,6 +237,9 @@ } } + /* (non-Javadoc) + * @see com.beem.project.beem.service.aidl.IPrivacyListManager#setDefaultPrivacyList(java.lang.String) + */ @Override public void setDefaultPrivacyList(String listName) throws RemoteException { try { @@ -239,18 +317,27 @@ } } + /* (non-Javadoc) + * @see com.beem.project.beem.service.aidl.IPrivacyListManager#addPrivacyListListener(com.beem.project.beem.service.aidl.IPrivacyListListener) + */ @Override public void addPrivacyListListener(IPrivacyListListener listener) throws RemoteException { if (listener != null) mPrivacyListListeners.register(listener); } + /* (non-Javadoc) + * @see com.beem.project.beem.service.aidl.IPrivacyListManager#removePrivacyListListener(com.beem.project.beem.service.aidl.IPrivacyListListener) + */ @Override public void removePrivacyListListener(IPrivacyListListener listener) throws RemoteException { if (listener != null) mPrivacyListListeners.unregister(listener); } + /* (non-Javadoc) + * @see com.beem.project.beem.service.aidl.IPrivacyListManager#getPrivacyLists() + */ @Override public List getPrivacyLists() throws RemoteException { Log.d(TAG, "BEGIN getPrivacyLists."); diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/service/RosterAdapter.java --- a/src/com/beem/project/beem/service/RosterAdapter.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/service/RosterAdapter.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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; import java.util.ArrayList; @@ -22,6 +65,7 @@ import com.beem.project.beem.service.aidl.IBeemRosterListener; import com.beem.project.beem.utils.Status; +// TODO: Auto-generated Javadoc /** * This class implement a Roster adapter for BEEM. */ @@ -169,11 +213,17 @@ mAdaptee.getEntry(jid).setName(name); } + /* (non-Javadoc) + * @see com.beem.project.beem.service.aidl.IRoster#getPresence(java.lang.String) + */ @Override public PresenceAdapter getPresence(String jid) throws RemoteException { return new PresenceAdapter(mAdaptee.getPresence(jid)); } + /* (non-Javadoc) + * @see com.beem.project.beem.service.aidl.IRoster#addContactToGroup(java.lang.String, java.lang.String) + */ @Override public void addContactToGroup(String groupName, String jid) throws RemoteException { createGroup(groupName); @@ -185,6 +235,9 @@ } } + /* (non-Javadoc) + * @see com.beem.project.beem.service.aidl.IRoster#removeContactFromGroup(java.lang.String, java.lang.String) + */ @Override public void removeContactFromGroup(String groupName, String jid) throws RemoteException { RosterGroup group = mAdaptee.getGroup(groupName); diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/service/XmppConnectionAdapter.java --- a/src/com/beem/project/beem/service/XmppConnectionAdapter.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/service/XmppConnectionAdapter.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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; import org.jivesoftware.smack.ConnectionConfiguration; @@ -33,6 +76,7 @@ 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 @@ -159,18 +203,15 @@ Log.d(TAG, "Error while connecting", e); if (e.getXMPPError() != null && e.getXMPPError().getMessage() != null) { mErrorMsg = e.getXMPPError().getMessage(); - Log.d(TAG, "XMPP Error "+ e.getXMPPError().getCode() + "message :" +e.getXMPPError().getMessage()); - } - else if (e.getStreamError() != null ) { + Log.d(TAG, "XMPP Error " + e.getXMPPError().getCode() + "message :" + e.getXMPPError().getMessage()); + } else if (e.getStreamError() != null) { mErrorMsg = e.getStreamError().toString(); - Log.d(TAG, "Stream Error "+ e.getStreamError().getCode() + "message :" +e.getStreamError()); - } - else if (e.getMessage() != null) { + Log.d(TAG, "Stream Error " + e.getStreamError().getCode() + "message :" + e.getStreamError()); + } else if (e.getMessage() != null) { // SASL !! mErrorMsg = e.getMessage(); Log.d(TAG, "Error " + e.getMessage()); - } - else + } else mErrorMsg = "Error On Connection"; mConListener.connectionFailed(mErrorMsg); } catch (IllegalStateException e) { @@ -196,8 +237,10 @@ 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 < -128) + p = -128; + if (priority > 128) + p = 128; mPreviousPriority = p; pres.setPriority(p); mAdaptee.sendPacket(pres); @@ -235,8 +278,8 @@ mStatusNotification.defaults = Notification.DEFAULT_LIGHTS; mStatusNotification.flags = Notification.FLAG_NO_CLEAR | Notification.FLAG_ONGOING_EVENT; - mStatusNotification.setLatestEventInfo(mService, "Beem Status", text, PendingIntent.getActivity( - mService, 0, new Intent(mService, ChangeStatus.class), 0)); + mStatusNotification.setLatestEventInfo(mService, "Beem Status", text, PendingIntent.getActivity(mService, 0, + new Intent(mService, ChangeStatus.class), 0)); mService.sendNotification(BeemService.NOTIFICATION_STATUS_ID, mStatusNotification); } @@ -327,7 +370,7 @@ /** * PrivacyListManagerAdapter mutator. - * @param privacyList the PrivacyListManager to set + * @param privacyListManager the privacy list manager */ public void setPrivacyListManager(PrivacyListManagerAdapter privacyListManager) { this.mPrivacyListManager = privacyListManager; @@ -433,14 +476,15 @@ @Override public void processPacket(Packet packet) { String from = packet.getFrom(); - Notification notif = new Notification(android.R.drawable.stat_notify_more, mService - .getString(R.string.AcceptContactRequest, from), System.currentTimeMillis()); + Notification notif = new Notification(android.R.drawable.stat_notify_more, mService.getString( + R.string.AcceptContactRequest, from), System.currentTimeMillis()); notif.defaults = Notification.DEFAULT_ALL; notif.flags = Notification.FLAG_AUTO_CANCEL; Intent intent = new Intent(mService, Subscription.class); intent.putExtra("from", from); - notif.setLatestEventInfo(mService, from, mService.getString(R.string.AcceptContactRequestFrom, - from), PendingIntent.getActivity(mService, 0, intent, PendingIntent.FLAG_ONE_SHOT)); + notif.setLatestEventInfo(mService, from, mService + .getString(R.string.AcceptContactRequestFrom, from), PendingIntent.getActivity(mService, 0, + intent, PendingIntent.FLAG_ONE_SHOT)); int id = packet.hashCode(); mService.sendNotification(id, notif); } @@ -533,14 +577,15 @@ @Override public void processPacket(Packet packet) { String from = packet.getFrom(); - Notification notif = new Notification(android.R.drawable.stat_notify_more, mService - .getString(R.string.AcceptContactRequest, from), System.currentTimeMillis()); + Notification notif = new Notification(android.R.drawable.stat_notify_more, mService.getString( + R.string.AcceptContactRequest, from), System.currentTimeMillis()); notif.defaults = Notification.DEFAULT_ALL; notif.flags = Notification.FLAG_AUTO_CANCEL; Intent intent = new Intent(mService, Subscription.class); intent.putExtra("from", from); - notif.setLatestEventInfo(mService, from, mService.getString(R.string.AcceptContactRequestFrom, - from), PendingIntent.getActivity(mService, 0, intent, PendingIntent.FLAG_ONE_SHOT)); + notif.setLatestEventInfo(mService, from, mService + .getString(R.string.AcceptContactRequestFrom, from), PendingIntent.getActivity(mService, 0, + intent, PendingIntent.FLAG_ONE_SHOT)); int id = packet.hashCode(); mService.sendNotification(id, notif); } diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/service/XmppFacade.java --- a/src/com/beem/project/beem/service/XmppFacade.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/service/XmppFacade.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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; import org.jivesoftware.smack.XMPPException; @@ -15,6 +58,7 @@ import com.beem.project.beem.service.aidl.IXmppFacade; import com.beem.project.beem.utils.PresenceType; +// TODO: Auto-generated Javadoc /** * This class is a facade for the Beem Service. * @author darisk @@ -101,6 +145,9 @@ return mConnexion.getPrivacyListManager(); } + /* (non-Javadoc) + * @see com.beem.project.beem.service.aidl.IXmppFacade#sendPresencePacket(com.beem.project.beem.service.PresenceAdapter) + */ @Override public void sendPresencePacket(PresenceAdapter presence) throws RemoteException { Presence presence2 = new Presence(PresenceType.getPresenceTypeFrom(presence.getType())); @@ -108,11 +155,17 @@ mConnexion.getAdaptee().sendPacket(presence2); } + /* (non-Javadoc) + * @see com.beem.project.beem.service.aidl.IXmppFacade#call(java.lang.String) + */ @Override public void call(String jid) throws RemoteException { mJingle.call(jid); } + /* (non-Javadoc) + * @see com.beem.project.beem.service.aidl.IXmppFacade#getVcardAvatar(java.lang.String) + */ @Override public byte[] getVcardAvatar(String jid) throws RemoteException { VCard vcard = new VCard(); diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/service/package-info.java --- a/src/com/beem/project/beem/service/package-info.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/service/package-info.java Fri Dec 04 17:30:17 2009 +0100 @@ -1,5 +1,45 @@ /** - * This package contains the class used by the Beem service process. - */ + 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 Véronis. + + 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 . + + 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; diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/ui/AddContact.java --- a/src/com/beem/project/beem/ui/AddContact.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/ui/AddContact.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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.ui; import java.util.ArrayList; @@ -24,6 +67,7 @@ import com.beem.project.beem.service.aidl.IXmppFacade; import com.beem.project.beem.utils.BeemBroadcastReceiver; +// TODO: Auto-generated Javadoc /** * This activity is used to add a contact. * @author nikita @@ -59,6 +103,9 @@ mReceiver = new BeemBroadcastReceiver(mServConn); } + /* (non-Javadoc) + * @see android.app.Activity#onStart() + */ @Override protected void onStart() { super.onStart(); @@ -88,6 +135,9 @@ } } + /* (non-Javadoc) + * @see android.app.Activity#onDestroy() + */ @Override protected void onDestroy() { super.onDestroy(); diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/ui/ChangeStatus.java --- a/src/com/beem/project/beem/ui/ChangeStatus.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/ui/ChangeStatus.java Fri Dec 04 17:30:17 2009 +0100 @@ -1,3 +1,47 @@ +/** + 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 Véronis. + + 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 . + + 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.ui; import android.app.Activity; @@ -26,10 +70,15 @@ import com.beem.project.beem.utils.BeemBroadcastReceiver; import com.beem.project.beem.utils.Status; +// TODO: Auto-generated Javadoc /** * This Activity is used to change the status. * @author nikita */ +/** + * @author nikita + * + */ public class ChangeStatus extends Activity { private static final Intent SERVICE_INTENT = new Intent(); @@ -117,6 +166,9 @@ } } + /* (non-Javadoc) + * @see android.app.Activity#onDestroy() + */ @Override protected void onDestroy() { super.onDestroy(); diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/ui/Chat.java --- a/src/com/beem/project/beem/ui/Chat.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/ui/Chat.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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.ui; import java.util.ArrayList; @@ -56,6 +99,7 @@ import com.beem.project.beem.utils.BeemBroadcastReceiver; import com.beem.project.beem.utils.Status; +// TODO: Auto-generated Javadoc /** * This class represents an activity which allows the user to chat with his/her contacts. * @author Jean-Manuel Da Silva @@ -781,11 +825,11 @@ mName = new TextView(context); mName.setText(name); - addView(mName, new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT)); + addView(mName, new LinearLayout.LayoutParams(android.view.ViewGroup.LayoutParams.FILL_PARENT, android.view.ViewGroup.LayoutParams.WRAP_CONTENT)); mMessage = new TextView(context); mMessage.setText(message); - addView(mMessage, new LinearLayout.LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT)); + addView(mMessage, new LinearLayout.LayoutParams(android.view.ViewGroup.LayoutParams.FILL_PARENT, android.view.ViewGroup.LayoutParams.WRAP_CONTENT)); } /** diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/ui/ContactList.java --- a/src/com/beem/project/beem/ui/ContactList.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/ui/ContactList.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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.ui; import java.util.ArrayList; @@ -54,6 +97,7 @@ import com.beem.project.beem.utils.BeemBroadcastReceiver; import com.beem.project.beem.utils.Status; +// TODO: Auto-generated Javadoc /** * The contact list activity displays the roster of the user. */ @@ -206,6 +250,9 @@ return super.onContextItemSelected(item); } + /* (non-Javadoc) + * @see android.app.Activity#onActivityResult(int, int, android.content.Intent) + */ @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); @@ -239,6 +286,9 @@ } } + /* (non-Javadoc) + * @see android.app.Activity#onDestroy() + */ @Override protected void onDestroy() { super.onDestroy(); @@ -698,9 +748,9 @@ private EditText mEditTextAlias; /** - * Constructor. - * @param context context activity. - */ + * Constructor. + * @param context context activity. + */ public DialogAlias(final Context context) { super(context); LayoutInflater factory = LayoutInflater.from(context); @@ -714,19 +764,22 @@ } /** - * Event click listener. - */ + * Event click listener. + */ class ContactDialogAliasDialog implements DialogInterface.OnClickListener { /** - * Constructor. - */ + * Constructor. + */ public ContactDialogAliasDialog() { } - @Override + /* (non-Javadoc) + * @see android.content.DialogInterface.OnClickListener#onClick(android.content.DialogInterface, int) + */ + @Override public void onClick(DialogInterface dialog, int which) { - if (which == Dialog.BUTTON_POSITIVE) { + if (which == DialogInterface.BUTTON_POSITIVE) { String name = mEditTextAlias.getText().toString(); if (name.length() == 0) name = mContact.getJID(); @@ -746,9 +799,9 @@ public class DialogResendSubscription extends AlertDialog.Builder { /** - * Constructor. - * @param context context activity - */ + * Constructor. + * @param context context activity + */ public DialogResendSubscription(final Context context) { super(context); setMessage(R.string.userinfo_sureresend); @@ -758,19 +811,22 @@ } /** - * Event click listener. - */ + * Event click listener. + */ class DialogClickListener implements DialogInterface.OnClickListener { /** - * Constructor. - */ + * Constructor. + */ DialogClickListener() { } - @Override + /* (non-Javadoc) + * @see android.content.DialogInterface.OnClickListener#onClick(android.content.DialogInterface, int) + */ + @Override public void onClick(DialogInterface dialog, int which) { - if (which == Dialog.BUTTON_POSITIVE) { + if (which == DialogInterface.BUTTON_POSITIVE) { Presence presencePacket = new Presence(Presence.Type.subscribe); presencePacket.setTo(mContact.getJID()); try { @@ -793,9 +849,9 @@ public class DialogDelete extends AlertDialog.Builder { /** - * Constructor. - * @param context context activity. - */ + * Constructor. + * @param context context activity. + */ public DialogDelete(final Context context) { super(context); setMessage(R.string.userinfo_sure2delete); @@ -816,7 +872,7 @@ @Override public void onClick(DialogInterface dialog, int which) { - if (which == Dialog.BUTTON_POSITIVE) { + if (which == DialogInterface.BUTTON_POSITIVE) { try { mRoster.deleteContact(mContact); } catch (RemoteException e) { diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/ui/CreateAccount.java --- a/src/com/beem/project/beem/ui/CreateAccount.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/ui/CreateAccount.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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.ui; import java.util.regex.Pattern; @@ -23,6 +66,7 @@ import com.beem.project.beem.R; +// TODO: Auto-generated Javadoc /** * This class represents an activity which allows the user to create an account on the XMPP server saved in settings. * @author Jean-Manuel Da Silva @@ -67,8 +111,7 @@ ConnectionConfiguration connectionConfiguration = null; ProxyInfo pi = null; if ((pi = getRegisteredProxy()) != null) { - connectionConfiguration = new ConnectionConfiguration(getXMPPServer(), getXMPPPort(), - pi); + connectionConfiguration = new ConnectionConfiguration(getXMPPServer(), getXMPPPort(), pi); } else { connectionConfiguration = new ConnectionConfiguration(getXMPPServer(), getXMPPPort()); } @@ -80,7 +123,8 @@ xmppConnection.connect(); AccountManager accountManager = new AccountManager(xmppConnection); accountManager.createAccount(username, password); - Toast toast = Toast.makeText(getApplicationContext(), String.format(getString(R.string.create_account_successfull_after),username), NOTIFICATION_DURATION); + Toast toast = Toast.makeText(getApplicationContext(), String.format( + getString(R.string.create_account_successfull_after), username), NOTIFICATION_DURATION); toast.show(); } catch (XMPPException e) { createErrorDialog(e.getMessage()); @@ -134,8 +178,7 @@ * @return Registered proxy port */ private int getRegisteredProxyPort() { - return Integer - .parseInt(mSettings.getString("settings_key_proxy_port", DEFAULT_STRING_VALUE)); + return Integer.parseInt(mSettings.getString("settings_key_proxy_port", DEFAULT_STRING_VALUE)); } /** @@ -164,7 +207,7 @@ break; default: result = ProxyInfo.ProxyType.NONE; - break; + break; } return result; } @@ -225,7 +268,7 @@ private boolean checkPasswords() { final String passwordFieldValue = ((EditText) findViewById(R.id.create_account_password)).getText().toString(); final String passwordConfirmFielddValue = ((EditText) findViewById(R.id.create_account_confirm_password)) - .getText().toString(); + .getText().toString(); return passwordFieldValue.equals(passwordConfirmFielddValue); } @@ -247,9 +290,9 @@ mCreateAccountButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { String usernameFieldValue = ((EditText) findViewById(R.id.create_account_username)).getText() - .toString(); + .toString(); String passwordFieldValue = ((EditText) findViewById(R.id.create_account_password)).getText() - .toString(); + .toString(); String username = StringUtils.parseName(usernameFieldValue); if (!checkEmail()) createErrorDialog(getString(R.string.create_account_err_username)); @@ -266,10 +309,10 @@ createAccountLoginButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { String usernameFieldValue = ((EditText) findViewById(R.id.create_account_username)).getText() - .toString(); + .toString(); String username = StringUtils.parseName(usernameFieldValue); String passwordFieldValue = ((EditText) findViewById(R.id.create_account_password)).getText() - .toString(); + .toString(); if (!checkEmail()) createErrorDialog(getString(R.string.create_account_err_username)); else if (!checkPasswords()) @@ -277,10 +320,8 @@ else { if (createAccount(username, passwordFieldValue)) { SharedPreferences.Editor settingsEditor = mSettings.edit(); - settingsEditor - .putString("settings_key_account_username", usernameFieldValue); - settingsEditor - .putString("settings_key_account_password", passwordFieldValue); + settingsEditor.putString("settings_key_account_username", usernameFieldValue); + settingsEditor.putString("settings_key_account_password", passwordFieldValue); settingsEditor.putBoolean("PreferenceIsConfigured", true); settingsEditor.commit(); finish(); diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/ui/GroupList.java --- a/src/com/beem/project/beem/ui/GroupList.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/ui/GroupList.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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.ui; import java.util.ArrayList; @@ -28,6 +71,7 @@ import com.beem.project.beem.service.aidl.IXmppFacade; import com.beem.project.beem.utils.BeemBroadcastReceiver; +// TODO: Auto-generated Javadoc /** * That activity permit to manage user groups. * @author nikita @@ -56,6 +100,9 @@ public GroupList() { } + /* (non-Javadoc) + * @see android.app.Activity#onCreate(android.os.Bundle) + */ @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -96,6 +143,9 @@ } } + /* (non-Javadoc) + * @see android.app.Activity#onDestroy() + */ @Override protected void onDestroy() { super.onDestroy(); diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/ui/Login.java --- a/src/com/beem/project/beem/ui/Login.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/ui/Login.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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.ui; import android.app.Activity; @@ -16,6 +59,7 @@ import com.beem.project.beem.R; import com.beem.project.beem.utils.BeemConnectivity; +// TODO: Auto-generated Javadoc /** * This class is the main Activity for the Beem project. * @author Da Risk @@ -33,6 +77,9 @@ public Login() { } + /* (non-Javadoc) + * @see android.app.Activity#onCreate(android.os.Bundle) + */ @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -41,6 +88,9 @@ mSettings = PreferenceManager.getDefaultSharedPreferences(this); } + /* (non-Javadoc) + * @see android.app.Activity#onStart() + */ @Override protected void onStart() { super.onStart(); @@ -54,6 +104,9 @@ } } + /* (non-Javadoc) + * @see android.app.Activity#onActivityResult(int, int, android.content.Intent) + */ @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { if (requestCode == 42) { @@ -71,6 +124,9 @@ } } + /* (non-Javadoc) + * @see android.app.Activity#onCreateOptionsMenu(android.view.Menu) + */ @Override public boolean onCreateOptionsMenu(Menu menu) { super.onCreateOptionsMenu(menu); @@ -79,6 +135,9 @@ return true; } + /* (non-Javadoc) + * @see android.app.Activity#onOptionsItemSelected(android.view.MenuItem) + */ @Override public final boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/ui/LoginAnim.java --- a/src/com/beem/project/beem/ui/LoginAnim.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/ui/LoginAnim.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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.ui; import android.app.Activity; @@ -21,6 +64,7 @@ import com.beem.project.beem.service.aidl.IXmppConnection; import com.beem.project.beem.service.aidl.IXmppFacade; +// TODO: Auto-generated Javadoc /** * This class is an activity which display an animation during the connection with the server. * @author Da Risk @@ -45,6 +89,9 @@ public LoginAnim() { } + /* (non-Javadoc) + * @see android.app.Activity#onCreate(android.os.Bundle) + */ @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -55,12 +102,18 @@ mCancelBt.setOnClickListener(new ClickListener()); } + /* (non-Javadoc) + * @see android.app.Activity#onStart() + */ @Override protected void onStart() { super.onStart(); mLogo.startAnimation(mRotateAnim); } + /* (non-Javadoc) + * @see android.app.Activity#onResume() + */ @Override protected void onResume() { super.onResume(); @@ -70,6 +123,9 @@ bindService(LoginAnim.SERVICE_INTENT, mServConn, BIND_AUTO_CREATE); } + /* (non-Javadoc) + * @see android.app.Activity#onPause() + */ @Override protected void onPause() { super.onPause(); @@ -79,6 +135,9 @@ } } + /* (non-Javadoc) + * @see android.app.Activity#onKeyDown(int, android.view.KeyEvent) + */ @Override public boolean onKeyDown(int keyCode, KeyEvent event) { // TODO use onBackPressed on Eclair (2.0) @@ -123,11 +182,14 @@ private String mMsg; /** - * Constructor. - */ + * Constructor. + */ LoginTask() { } + /* (non-Javadoc) + * @see android.os.AsyncTask#doInBackground(Params[]) + */ @Override protected Boolean doInBackground(IXmppFacade... params) { boolean result = true; @@ -146,6 +208,9 @@ return result; } + /* (non-Javadoc) + * @see android.os.AsyncTask#onPostExecute(java.lang.Object) + */ @Override protected void onPostExecute(Boolean result) { @@ -165,6 +230,9 @@ } } + /* (non-Javadoc) + * @see android.os.AsyncTask#onCancelled() + */ @Override protected void onCancelled() { try { diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/ui/PrivacyList.java --- a/src/com/beem/project/beem/ui/PrivacyList.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/ui/PrivacyList.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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.ui; import java.util.ArrayList; @@ -33,6 +76,7 @@ import com.beem.project.beem.service.aidl.IXmppFacade; import com.beem.project.beem.utils.BeemBroadcastReceiver; +// TODO: Auto-generated Javadoc /** * This class represents an activity which allows the user to manage his privacy lists. * @author Jean-Manuel Da Silva @@ -134,8 +178,8 @@ new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { String[] items = getResources().getStringArray(R.array.privacy_list_select_dialog); - if (items[which].equals(getResources().getString( - R.string.privacy_list_select_dialog_delete))) { + if (items[which].equals(getResources() + .getString(R.string.privacy_list_select_dialog_delete))) { try { mPrivacyListManager.removePrivacyList(mPrivacyListNames.get(mPosLastClickedItem)); } catch (RemoteException e) { diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/ui/Settings.java --- a/src/com/beem/project/beem/ui/Settings.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/ui/Settings.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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.ui; import android.content.BroadcastReceiver; @@ -15,6 +58,7 @@ import com.beem.project.beem.R; import com.beem.project.beem.utils.BeemBroadcastReceiver; +// TODO: Auto-generated Javadoc /** * This class represents an activity which allows the user to change his account or proxy parameters. */ @@ -33,6 +77,9 @@ public Settings() { } + /* (non-Javadoc) + * @see android.preference.PreferenceActivity#onCreate(android.os.Bundle) + */ @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -93,7 +140,8 @@ startActivity(i); return true; case R.id.settings_menu_privacy_lists: - i = new Intent(this, PrivacyList.class); startActivity(i); + i = new Intent(this, PrivacyList.class); + startActivity(i); return true; default: return false; diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/ui/Subscription.java --- a/src/com/beem/project/beem/ui/Subscription.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/ui/Subscription.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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.ui; import org.jivesoftware.smack.packet.Presence; @@ -22,6 +65,7 @@ import com.beem.project.beem.service.aidl.IXmppFacade; import com.beem.project.beem.utils.BeemBroadcastReceiver; +// TODO: Auto-generated Javadoc /** * This activity is used to accept a subscription request. * @author nikita @@ -45,6 +89,9 @@ public Subscription() { } + /* (non-Javadoc) + * @see android.app.Activity#onCreate(android.os.Bundle) + */ @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -59,6 +106,9 @@ this.registerReceiver(mReceiver, new IntentFilter(BeemBroadcastReceiver.BEEM_CONNECTION_CLOSED)); } + /* (non-Javadoc) + * @see android.app.Activity#onResume() + */ @Override protected void onResume() { super.onResume(); @@ -66,6 +116,9 @@ mReceiver.setBinded(true); } + /* (non-Javadoc) + * @see android.app.Activity#onPause() + */ @Override protected void onPause() { super.onPause(); @@ -75,6 +128,9 @@ } } + /* (non-Javadoc) + * @see android.app.Activity#onDestroy() + */ @Override protected void onDestroy() { super.onDestroy(); diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/ui/package-info.java --- a/src/com/beem/project/beem/ui/package-info.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/ui/package-info.java Fri Dec 04 17:30:17 2009 +0100 @@ -1,5 +1,45 @@ /** - * This package contains the class concerning the user interface (activities) of Beem. - */ + 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 Véronis. + + 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 . + + 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.ui; diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/utils/BeemBroadcastReceiver.java --- a/src/com/beem/project/beem/utils/BeemBroadcastReceiver.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/utils/BeemBroadcastReceiver.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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.utils; import android.app.Activity; @@ -8,15 +51,14 @@ import android.util.Log; import android.widget.Toast; +// TODO: Auto-generated Javadoc /** * Manage broadcast disconnect intent. * @author nikita */ public class BeemBroadcastReceiver extends BroadcastReceiver { - /** - * Broadcast intent type. - */ + /** Broadcast intent type. */ public static final String BEEM_CONNECTION_CLOSED = "BeemConnectionClosed"; private ServiceConnection mService; private boolean mIsBinded; @@ -41,8 +83,8 @@ setBinded(false); // TODO ce code est comment car il empeche de gerer un cancel sur une connexion // start activity if unexpected disconnection -// if (!intent.getBooleanExtra("normally", false)) -// context.startActivity(new Intent(context, Login.class)); + // if (!intent.getBooleanExtra("normally", false)) + // context.startActivity(new Intent(context, Login.class)); CharSequence message = intent.getCharSequenceExtra("message"); Toast.makeText(context, message, Toast.LENGTH_SHORT).show(); if (context instanceof Activity) { diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/utils/BeemConnectivity.java --- a/src/com/beem/project/beem/utils/BeemConnectivity.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/utils/BeemConnectivity.java Fri Dec 04 17:30:17 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 Véronis. + + 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 . + + 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.utils; import android.content.Context; @@ -8,13 +51,28 @@ import android.net.wifi.WifiManager; import android.telephony.TelephonyManager; +// TODO: Auto-generated Javadoc +/** + * The Class BeemConnectivity. + */ public class BeemConnectivity { + + /** + * Checks if is connected. + * @param ctx the ctx + * @return true, if is connected + */ static public boolean isConnected(Context ctx) { ConnectivityManager cm = (ConnectivityManager) ctx.getSystemService(Context.CONNECTIVITY_SERVICE); NetworkInfo ni = cm.getActiveNetworkInfo(); return ni != null && ni.isConnected(); } + /** + * Checks if is wifi. + * @param ctx the ctx + * @return true, if is wifi + */ public static boolean isWifi(Context ctx) { WifiManager wm = (WifiManager) ctx.getSystemService(Context.WIFI_SERVICE); WifiInfo wi = wm.getConnectionInfo(); @@ -28,19 +86,28 @@ return false; } + /** + * Checks if is umts. + * @param ctx the ctx + * @return true, if is umts + */ public static boolean isUmts(Context ctx) { - TelephonyManager tm = (TelephonyManager)ctx.getSystemService(Context.TELEPHONY_SERVICE); + TelephonyManager tm = (TelephonyManager) ctx.getSystemService(Context.TELEPHONY_SERVICE); if (tm.getNetworkType() >= TelephonyManager.NETWORK_TYPE_UMTS) return true; return false; } + /** + * Checks if is edge. + * @param ctx the ctx + * @return true, if is edge + */ public static boolean isEdge(Context ctx) { - TelephonyManager tm = (TelephonyManager)ctx.getSystemService(Context.TELEPHONY_SERVICE); + TelephonyManager tm = (TelephonyManager) ctx.getSystemService(Context.TELEPHONY_SERVICE); if (tm.getNetworkType() == TelephonyManager.NETWORK_TYPE_EDGE) return true; return false; } - } diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/utils/FreePort.java --- a/src/com/beem/project/beem/utils/FreePort.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/utils/FreePort.java Fri Dec 04 17:30:17 2009 +0100 @@ -1,8 +1,52 @@ +/** + 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 Véronis. + + 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 . + + 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.utils; import java.io.IOException; import java.net.ServerSocket; +// TODO: Auto-generated Javadoc /** * Utility class to get a free port. * @author nikita diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/utils/PresenceType.java --- a/src/com/beem/project/beem/utils/PresenceType.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/utils/PresenceType.java Fri Dec 04 17:30:17 2009 +0100 @@ -1,50 +1,77 @@ /** - * - */ + 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 Véronis. + + 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 . + + 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.utils; import org.jivesoftware.smack.packet.Presence; +// TODO: Auto-generated Javadoc /** * Utility class to deal with Presence type. * @author nikita */ public final class PresenceType { - /** - * The user is available to receive messages (default). - */ + /** The user is available to receive messages (default). */ public static final int AVAILABLE = 100; - /** - * The user is unavailable to receive messages. - */ + /** The user is unavailable to receive messages. */ public static final int UNAVAILABLE = 200; - /** - * Request subscription to recipient's presence. - */ + /** Request subscription to recipient's presence. */ public static final int SUBSCRIBE = 300; - /** - * Grant subscription to sender's presence. - */ + /** Grant subscription to sender's presence. */ public static final int SUBSCRIBED = 400; - /** - * Request removal of subscription to sender's presence. - */ + /** Request removal of subscription to sender's presence. */ public static final int UNSUBSCRIBE = 500; - /** - * Grant removal of subscription to sender's presence. - */ + /** Grant removal of subscription to sender's presence. */ public static final int UNSUBSCRIBED = 600; - /** - * The presence packet contains an error message. - */ + /** The presence packet contains an error message. */ public static final int ERROR = 701; /** diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/utils/Status.java --- a/src/com/beem/project/beem/utils/Status.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/utils/Status.java Fri Dec 04 17:30:17 2009 +0100 @@ -1,45 +1,74 @@ /** - * - */ + 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 Véronis. + + 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 . + + 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.utils; import org.jivesoftware.smack.packet.Presence; import org.jivesoftware.smack.packet.Presence.Mode; +// TODO: Auto-generated Javadoc /** * Utility class to deal with status and presence value. * @author marseille */ public final class Status { - /** - * Status of a disconnected contact. - */ + /** Status of a disconnected contact. */ public static final int CONTACT_STATUS_DISCONNECT = 100; - /** - * Status of a unavailable (long away) contact. - */ + /** Status of a unavailable (long away) contact. */ public static final int CONTACT_STATUS_UNAVAILABLE = 200; - /** - * Status of a away contact. - */ + /** Status of a away contact. */ public static final int CONTACT_STATUS_AWAY = 300; - /** - * Status of a busy contact. - */ + /** Status of a busy contact. */ public static final int CONTACT_STATUS_BUSY = 400; - /** - * Status of a available contact. - */ + /** Status of a available contact. */ public static final int CONTACT_STATUS_AVAILABLE = 500; - /** - * Status of a available for chat contact. - */ + /** Status of a available for chat contact. */ public static final int CONTACT_STATUS_AVAILABLE_FOR_CHAT = 600; /** diff -r 98442ee557bf -r 896533b277d5 src/com/beem/project/beem/utils/package-info.java --- a/src/com/beem/project/beem/utils/package-info.java Fri Dec 04 17:02:03 2009 +0100 +++ b/src/com/beem/project/beem/utils/package-info.java Fri Dec 04 17:30:17 2009 +0100 @@ -1,5 +1,45 @@ /** - * This package contains utility class used by the Beem project. - */ + 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 Véronis. + + 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 . + + 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.utils;