# HG changeset patch # User Nikita Kozlov # Date 1293292860 -3600 # Node ID 0e5b95573614f6f4a639cf3fea5fe005f76cf637 # Parent 696b2880c994b516a3ac5dfc1de4f80802500d58# Parent 532fdf132146e972b456caafbcdddc8151910a3f merge diff -r 532fdf132146 -r 0e5b95573614 .classpath --- a/.classpath Sun Feb 14 17:25:38 2010 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff -r 532fdf132146 -r 0e5b95573614 .hgignore --- a/.hgignore Sun Feb 14 17:25:38 2010 +0100 +++ b/.hgignore Sat Dec 25 17:01:00 2010 +0100 @@ -7,4 +7,4 @@ local.properties **~ **/.*.sw? - +.classpath diff -r 532fdf132146 -r 0e5b95573614 .hgtags --- a/.hgtags Sun Feb 14 17:25:38 2010 +0100 +++ b/.hgtags Sat Dec 25 17:01:00 2010 +0100 @@ -1,3 +1,8 @@ 16373c4cd73330fa568960a11a6ee7aea6886a4d sfr-release bccd99644eac57bb19a239697704db089dd585f7 0.1 af35b5109f172411de5798991e89919b7ed5cf85 0.1.1 +25f6fded204ab05c9f89556cbc08cd191e0f2c52 0.1.2 +c77d496146964d9239b4c45446d99b960415a4a6 0.1.3 +1b88edb34d96acb5795b8d28e58b974f1bf2c1d6 0.1.4_rc +887b6a1fd9662312bf1ec271f9735369ead04cad 0.1.4 +cf5db8d24b2a28ca501cc3e076abc55b38b41d90 0.1.4 diff -r 532fdf132146 -r 0e5b95573614 AndroidManifest.xml --- a/AndroidManifest.xml Sun Feb 14 17:25:38 2010 +0100 +++ b/AndroidManifest.xml Sat Dec 25 17:01:00 2010 +0100 @@ -1,19 +1,21 @@ + package="com.beem.project.beem" android:versionCode="5" + android:versionName="0.1.4"> + android:debuggable="true" android:name=".BeemApplication"> + android:launchMode="standard"> + + + android:launchMode="singleTop" android:screenOrientation="portrait" />

- +

@@ -82,22 +86,20 @@ android:label="Beem Service" android:permission="com.beem.project.beem.BEEM_SERVICE"> + +

- - - - - - - - - + android:name="com.beem.project.beem.BEEM_SERVICE"/> + + + + +

diff -r 532fdf132146 -r 0e5b95573614 CREDITS --- a/CREDITS Sun Feb 14 17:25:38 2010 +0100 +++ b/CREDITS Sat Dec 25 17:01:00 2010 +0100 @@ -1,9 +1,24 @@ This file contains the name of the people who have contributed to BEEM. The names are sorted alphabetically by last name. +Core Team : Frederic-Charles Barthelery Jean-Manuel Da Silva Nikita Kozlov Philippe Lago Jean Baptiste Vergely Vincent Véronis + +Contributors : +Nolan Darilek +Stefan Endrullis + +Tranlators : +GoApk http://goapk.com for chinese translations +Daniel Hofmann for german translations +Andrea Selva for italian translations +Erik Lindström for swedish translations + + +Thanks to all ! + diff -r 532fdf132146 -r 0e5b95573614 INSTALL --- a/INSTALL Sun Feb 14 17:25:38 2010 +0100 +++ b/INSTALL Sat Dec 25 17:01:00 2010 +0100 @@ -1,13 +1,33 @@ -Howto Install Beem ? +Android Market +-------------- + +First of all, BEEM is available on the Android market. Just search for 'BEEM'. + +Development version +------------------- 1. Dependencies - First you will need the Android SDK-1.5. + First you will need the latest Android SDK. You can download it at http://d.android.com. Beem is usually built with Android SDK 2.1 or superior. + You will also need the Apache Ant tool to build the project. You can get it at http://ant.apache.org 2. Android project - Use the script provides by the SDK to set the Android platform directory. - > $SDK_DIR/tools/android update project -t 2 -p $BEEM_DIRECTORY + Use the android program provides by the SDK to set the Android platform directory. + + Set up the Beem project. + > $SDK_DIR/tools/android update project -p $BEEM_DIRECTORY + +or + + If you want to build Beem for a different Android Target platform : + Get the Target id of the platform you want to build BEEM for. + > $SDK_DIR/tools/android list targets + + Then use this id to set up the BEEM project. + > $SDK_DIR/tools/android update project -t $TARGET_ID -p $BEEM_DIRECTORY 3. Compile and install - Use ant to compile and install the application on the Android emulator + Use ant to compile and install the application on the Android device > ant install +The development version use a private certificate to sign the package. You will need to uninstall it before installing or upgrading a version of BEEM from the Android market. + diff -r 532fdf132146 -r 0e5b95573614 README --- a/README Sun Feb 14 17:25:38 2010 +0100 +++ b/README Sat Dec 25 17:01:00 2010 +0100 @@ -1,3 +1,52 @@ +BEEM : Boost Your Eyes, Ears, and Mouth +--------------------------------------- + +BEEM is a full featured and easy to use XMPP (formerly named Jabber) client on the Android Platform. + +Beem is under constant development. Releases are usually frequent and driven by user contributions, such as bug reports and patches. + +Beem is free and contains no ads. All our code is open source and licensed under the GNU General Public License 3 and any later version. This means you can get Beem's code and modify it to suit your needs, as long as you publish the changes you make for everyone to benefit from as well. + + +Features +-------- + +- Compatible with any standard XMPP server +- SASL support +- Proxy support (SOCKS4 SOCKS5 HTTP) +- Support of DNS SERV + +New in 0.1.2: +- DNS SERV +- New options +- Bug fix + +Futur: +- Geolocation +- Voip +- MUC +- Phone contact list + + +Support & getting help +---------------------- + +For getting help or discussing about BEEM, you can join #beem on the freenode IRC network or on XMPP Multi User Chat : beem@conference.elyzion.net. +We have a mailing list, feel free to subscribe here : http://list.beem-project.com/listinfo/beem-dev +You can also contact the BEEM Team at beem-dev@list.beem-project.com. + +Before submitting a bug report, a patch or a feature request here, please read the Submission guidelines. + + +Contributing and helping out +---------------------------- + +Beem is built and maintained by community volunteers. If you enjoy using it and would like to give back to the community, feel free to contact us. + + + + Thanks you for downloading BEEM http://www.beem-project.com + diff -r 532fdf132146 -r 0e5b95573614 beem_key Binary file beem_key has changed diff -r 532fdf132146 -r 0e5b95573614 build.xml --- a/build.xml Sun Feb 14 17:25:38 2010 +0100 +++ b/build.xml Sat Dec 25 17:01:00 2010 +0100 @@ -70,8 +70,11 @@ + + + diff -r 532fdf132146 -r 0e5b95573614 default.properties --- a/default.properties Sun Feb 14 17:25:38 2010 +0100 +++ b/default.properties Sat Dec 25 17:01:00 2010 +0100 @@ -7,8 +7,5 @@ # "build.properties", and override values to adapt the script to your # project structure. -# Indicates whether an apk should be generated for each density. -split.density=false # Project target. -target=android-7 -apk-configurations= +target=android-9 diff -r 532fdf132146 -r 0e5b95573614 doc/asmack-beem/README.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/asmack-beem/README.txt Sat Dec 25 17:01:00 2010 +0100 @@ -0,0 +1,43 @@ +INTRODUCTION +------------ +asmack http://code.google.com/p/asmack/ is a portage of the Smack library for +the Android platform. The project is mostly maintained by Rene Treffer and you +can find the binaries at http://code.google.com/p/asmack/ and the sources at +http://github.com/rtreffer/asmack + +The asmack project is based on the development version of the Smack library. +This version is constantly moving but we want a fixed version for BEEM. +We patched the asmack build process to use a fixed version of the Smack +library. Currently, we use the revision 11644 of the Smack SVN repository. + +COMPILE +------- + +First check out the last version of asmack +> git clone git://github.com/rtreffer/asmack.git + +Then apply the beem-build-process.patch on the source. +> cd asmack +> patch -p1 < beem-build-process.patch +> + +Add the beem flavour to the patch repository +> cp -R beem_patches patch/beem +> + +The 50-fix_chatmanager.patch is only necessary to fix a little bug in smack. The +patch has been proposed to the Smack developers. See +http://www.igniterealtime.org/issues/browse/SMACK-269 for progress. + +Edit your local.properties file to contains the path of the android SDK. See +local.properties.example + +Build asmack +> ./build.batch +> + +The build directory will contains the files : + * asmack-android-$VERSION-beem.jar for asmack binaries for android $VERSION + * asmack-android-$VERSION-source-beem.zip for the asmack custom sources for + android $VERSION. + diff -r 532fdf132146 -r 0e5b95573614 doc/asmack-beem/beem-build-process.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/asmack-beem/beem-build-process.patch Sat Dec 25 17:01:00 2010 +0100 @@ -0,0 +1,33 @@ +--- asmack-git/build.bash 2010-05-07 22:08:18.000000000 +0200 ++++ asmack/build.bash 2010-05-07 22:06:53.000000000 +0200 +@@ -15,11 +15,11 @@ + if ! [ -f "${2}/.svn/entries" ]; then + mkdir "${2}" + cd "${2}" +- svn co --non-interactive --trust-server-cert "${1}" "." ++ svn co --non-interactive --trust-server-cert "${1}" -r "${3}" "." + else + cd "${2}" + svn cleanup +- svn up ++ svn up -r "${3}" + fi + ) + } +@@ -37,11 +37,11 @@ + } + + fetchall() { +- gitfetch "git://github.com/rtreffer/smack.git" "smack" +- fetch "http://svn.apache.org/repos/asf/qpid/trunk/qpid/java/management/common/src/main/" "qpid" +- fetch "http://svn.apache.org/repos/asf/harmony/enhanced/java/trunk/classlib/modules/auth/src/main/java/common/" "harmony" +- fetch "https://dnsjava.svn.sourceforge.net/svnroot/dnsjava/trunk" "dnsjava" +- fetch "https://kenai.com/svn/jbosh~main/trunk/jbosh/src/main/java" "jbosh" ++ fetch "http://svn.igniterealtime.org/svn/repos/smack/trunk" "smack" "11644" ++ fetch "http://svn.apache.org/repos/asf/qpid/trunk/qpid/java/management/common/src/main/" "qpid" "HEAD" ++ fetch "http://svn.apache.org/repos/asf/harmony/enhanced/java/trunk/classlib/modules/auth/src/main/java/common/" "harmony" "HEAD" ++ fetch "https://dnsjava.svn.sourceforge.net/svnroot/dnsjava/trunk" "dnsjava" "HEAD" ++ fetch "https://kenai.com/svn/jbosh~main/trunk/jbosh/src/main/java" "jbosh" "HEAD" + } + + copyfolder() { diff -r 532fdf132146 -r 0e5b95573614 doc/asmack-beem/beem_patches/10-PubSubManager-non-final.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/asmack-beem/beem_patches/10-PubSubManager-non-final.patch Sat Dec 25 17:01:00 2010 +0100 @@ -0,0 +1,13 @@ +Index: org/jivesoftware/smackx/pubsub/PubSubManager.java +=================================================================== +--- org/jivesoftware/smackx/pubsub/PubSubManager.java (revision 11464) ++++ org/jivesoftware/smackx/pubsub/PubSubManager.java (working copy) +@@ -41,7 +41,7 @@ + * + * @author Robin Collier + */ +-final public class PubSubManager ++public class PubSubManager + { + private XMPPConnection con; + private String to; diff -r 532fdf132146 -r 0e5b95573614 doc/asmack-beem/beem_patches/50-fix-chatmanager.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/asmack-beem/beem_patches/50-fix-chatmanager.patch Sat Dec 25 17:01:00 2010 +0100 @@ -0,0 +1,32 @@ + Copyright (C) 2010 by Frederic-Charles Barthelery, + Jean-Manuel Da Silva, + Nikita Kozlov, + Philippe Lago, + Jean Baptiste Vergely, + Vincent Veronis. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--- ../../../src/smack/org/jivesoftware/smack/ChatManager.java 2010-02-23 19:27:26.000000000 +0100 ++++ org/jivesoftware/smack/ChatManager.java 2010-02-23 19:37:47.000000000 +0100 +@@ -111,7 +111,9 @@ + chat = getUserChat(message.getFrom()); + } + } +- ++ if (chat == null) { ++ chat = getUserChat(StringUtils.parseBareAddress(message.getFrom())); ++ } + if(chat == null) { + chat = createChat(message); + } diff -r 532fdf132146 -r 0e5b95573614 doc/asmack-beem/beem_patches/50-fix-sasl-incorrect-encoding.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/asmack-beem/beem_patches/50-fix-sasl-incorrect-encoding.patch Sat Dec 25 17:01:00 2010 +0100 @@ -0,0 +1,31 @@ + Copyright (C) 2010 by Frederic-Charles Barthelery, + Jean-Manuel Da Silva, + Nikita Kozlov, + Philippe Lago, + Jean Baptiste Vergely, + Vincent Veronis. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--- org/jivesoftware/smack/sasl/SASLMechanism.java~ 2010-07-20 15:13:25.000000000 +0200 ++++ org/jivesoftware/smack/sasl/SASLMechanism.java 2010-07-20 15:15:41.000000000 +0200 +@@ -263,9 +263,6 @@ + if (authenticationText != null) { + stanza.append(authenticationText); + } +- else { +- stanza.append("="); +- } + stanza.append(""); + return stanza.toString(); + } diff -r 532fdf132146 -r 0e5b95573614 doc/asmack-beem/beem_patches/50-improved-pubsub.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/asmack-beem/beem_patches/50-improved-pubsub.patch Sat Dec 25 17:01:00 2010 +0100 @@ -0,0 +1,46 @@ +--- ../../../src/smack/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java (révision 11644) ++++ org/jivesoftware/smackx/pubsub/provider/ItemProvider.java (copie de travail) +@@ -45,6 +45,8 @@ + } + else + { ++ while (tag != XmlPullParser.START_TAG) ++ tag = parser.next(); + String payloadElemName = parser.getName(); + String payloadNS = parser.getNamespace(); + +--- ../../../src/org/jivesoftware/smackx/pubsub/Node.java (révision 11644) ++++ org/jivesoftware/smackx/pubsub/Node.java (copie de travail) +@@ -60,7 +60,7 @@ + * + * For example, OpenFire requires the server to be prefixed by pubsub + */ +- void setTo(String toAddress) ++ public void setTo(String toAddress) + { + to = toAddress; + } +--- ../../../src/org/jivesoftware/smackx/pubsub/LeafNode.java (révision 11644) ++++ org/jivesoftware/smackx/pubsub/LeafNode.java (copie de travail) +@@ -34,7 +34,7 @@ + */ + public class LeafNode extends Node + { +- LeafNode(Connection connection, String nodeName) ++ public LeafNode(Connection connection, String nodeName) + { + super(connection, nodeName); + } +--- ../../../src/org/jivesoftware/smackx/pubsub/PubSubManager.java (révision 11644) ++++ org/jivesoftware/smackx/pubsub/PubSubManager.java (copie de travail) +@@ -43,8 +43,8 @@ + */ + final public class PubSubManager + { +- private Connection con; +- private String to; ++ protected Connection con; ++ protected String to; + private Map nodeMap = new ConcurrentHashMap(); + + /** diff -r 532fdf132146 -r 0e5b95573614 doc/asmack-beem/beem_patches/50-public-info-features.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/asmack-beem/beem_patches/50-public-info-features.patch Sat Dec 25 17:01:00 2010 +0100 @@ -0,0 +1,37 @@ + Copyright (C) 2010 by Frederic-Charles Barthelery, + Jean-Manuel Da Silva, + Nikita Kozlov, + Philippe Lago, + Jean Baptiste Vergely, + Vincent Veronis. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--- org/jivesoftware/smackx/packet/DiscoverInfo.java 2010-07-22 22:16:27.000000000 +0200 ++++ org/jivesoftware/smackx/packet/DiscoverInfo.java 2010-07-22 22:58:43.000000000 +0200 +@@ -62,7 +62,7 @@ + * + * @return an Iterator on the discovered features of an XMPP entity + */ +- Iterator getFeatures() { ++ public Iterator getFeatures() { + synchronized (features) { + return Collections.unmodifiableList(features).iterator(); + } +@@ -266,4 +266,4 @@ + return buf.toString(); + } + } +-} +\ Pas de fin de ligne à la fin du fichier. ++} diff -r 532fdf132146 -r 0e5b95573614 doc/asmack-beem/beem_patches/COPYING --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/asmack-beem/beem_patches/COPYING Sat Dec 25 17:01:00 2010 +0100 @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff -r 532fdf132146 -r 0e5b95573614 doc/asmack-beem/beem_patches/README.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/asmack-beem/beem_patches/README.txt Sat Dec 25 17:01:00 2010 +0100 @@ -0,0 +1,9 @@ +This directory contains different patch to apply on asmack sources. These +patches will allow us to build a custom flavour of asmack for Beem. This +directory must be copied in the patch directory of asmack in order to be used. +Then build asmack the usual way. + +All the patches are released under the Apache License, Version 2.0 +You may obtain a copy of the License at +http://www.apache.org.licenses/LICENCE-2.0 + diff -r 532fdf132146 -r 0e5b95573614 libs/README.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libs/README.txt Sat Dec 25 17:01:00 2010 +0100 @@ -0,0 +1,10 @@ +This directory contains the libraries used by BEEM. + +The principal one is asmack, a portage of the Smack library for the Android +platform. + +The source of the asmack library can be downloaded at +http://dev.beem-project.com/attachments/download/51/asmack-android-2.1-source-beem.zip + +See the file doc/asmack-beem/README.txt for more informations. + diff -r 532fdf132146 -r 0e5b95573614 libs/asmack-android-7-beem.jar Binary file libs/asmack-android-7-beem.jar has changed diff -r 532fdf132146 -r 0e5b95573614 libs/asmack-jse.jar Binary file libs/asmack-jse.jar has changed diff -r 532fdf132146 -r 0e5b95573614 libs/jlibrtp.jar Binary file libs/jlibrtp.jar has changed diff -r 532fdf132146 -r 0e5b95573614 libs/security.jar Binary file libs/security.jar has changed diff -r 532fdf132146 -r 0e5b95573614 res/anim/rotate_and_scale.xml --- a/res/anim/rotate_and_scale.xml Sun Feb 14 17:25:38 2010 +0100 +++ b/res/anim/rotate_and_scale.xml Sat Dec 25 17:01:00 2010 +0100 @@ -1,11 +1,6 @@ - + + + + + + + diff -r 532fdf132146 -r 0e5b95573614 res/drawable/beem_launcher_icon_color.png Binary file res/drawable/beem_launcher_icon_color.png has changed diff -r 532fdf132146 -r 0e5b95573614 res/drawable/bottombar.png Binary file res/drawable/bottombar.png has changed diff -r 532fdf132146 -r 0e5b95573614 res/drawable/button_indicator_next.png Binary file res/drawable/button_indicator_next.png has changed diff -r 532fdf132146 -r 0e5b95573614 res/drawable/button_indicator_prev.png Binary file res/drawable/button_indicator_prev.png has changed diff -r 532fdf132146 -r 0e5b95573614 res/drawable/ic_menu_add.png Binary file res/drawable/ic_menu_add.png has changed diff -r 532fdf132146 -r 0e5b95573614 res/drawable/ic_menu_close_clear_cancel.png Binary file res/drawable/ic_menu_close_clear_cancel.png has changed diff -r 532fdf132146 -r 0e5b95573614 res/drawable/ic_menu_manage.png Binary file res/drawable/ic_menu_manage.png has changed diff -r 532fdf132146 -r 0e5b95573614 res/drawable/status_icon.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/res/drawable/status_icon.xml Sat Dec 25 17:01:00 2010 +0100 @@ -0,0 +1,13 @@ + + + + + + + + + diff -r 532fdf132146 -r 0e5b95573614 res/layout/addcontact.xml --- a/res/layout/addcontact.xml Sun Feb 14 17:25:38 2010 +0100 +++ b/res/layout/addcontact.xml Sat Dec 25 17:01:00 2010 +0100 @@ -11,21 +11,24 @@ + android:layout_margin="3dip" + android:contentDescription="@string/AddCLogin"/> + android:scrollHorizontally="true" android:layout_margin="3dip" + android:contentDescription="@string/AddCAlias"/> + android:layout_margin="3dip" + android:contentDescription="@string/AddCGroup"/>