# HG changeset patch # User Nikita Kozlov # Date 1291571147 -3600 # Node ID 6cbb9b3117b7ac54ed6dacb7af6e15793611e92f # Parent 2655ee22df9f7ee8d7df6454069edaf7c644a824 merge diff -r 2655ee22df9f -r 6cbb9b3117b7 .hgignore diff -r 2655ee22df9f -r 6cbb9b3117b7 .hgtags diff -r 2655ee22df9f -r 6cbb9b3117b7 AndroidManifest.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 COPYING diff -r 2655ee22df9f -r 6cbb9b3117b7 CREDITS diff -r 2655ee22df9f -r 6cbb9b3117b7 INSTALL diff -r 2655ee22df9f -r 6cbb9b3117b7 README diff -r 2655ee22df9f -r 6cbb9b3117b7 build.properties diff -r 2655ee22df9f -r 6cbb9b3117b7 build.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 default.properties diff -r 2655ee22df9f -r 6cbb9b3117b7 doc/UmlGraph.jar diff -r 2655ee22df9f -r 6cbb9b3117b7 doc/android/package-list diff -r 2655ee22df9f -r 6cbb9b3117b7 doc/asmack-beem/README.txt diff -r 2655ee22df9f -r 6cbb9b3117b7 doc/asmack-beem/beem-build-process.patch diff -r 2655ee22df9f -r 6cbb9b3117b7 doc/asmack-beem/beem_patches/50-fix-chatmanager.patch diff -r 2655ee22df9f -r 6cbb9b3117b7 doc/asmack-beem/beem_patches/50-fix-sasl-incorrect-encoding.patch diff -r 2655ee22df9f -r 6cbb9b3117b7 doc/asmack-beem/beem_patches/50-public-info-features.patch diff -r 2655ee22df9f -r 6cbb9b3117b7 doc/asmack-beem/beem_patches/COPYING diff -r 2655ee22df9f -r 6cbb9b3117b7 doc/asmack-beem/beem_patches/README.txt diff -r 2655ee22df9f -r 6cbb9b3117b7 doc/favicon.ico diff -r 2655ee22df9f -r 6cbb9b3117b7 doc/smack/package-list diff -r 2655ee22df9f -r 6cbb9b3117b7 libs/README.txt diff -r 2655ee22df9f -r 6cbb9b3117b7 libs/asmack-android-7-beem.jar diff -r 2655ee22df9f -r 6cbb9b3117b7 res/anim/rotate_and_scale.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable-hdpi/beem_icon_launcher_color.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable-ldpi/beem_icon_launcher_color.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable-mdpi/beem_icon_launcher_color.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/background.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/beem_launcher_icon_silver.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/beem_status_icon.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/bottombar.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/button_indicator_next.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/button_indicator_prev.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/ic_menu_add.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/ic_menu_blocked_user.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/ic_menu_chat_dashboard.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/ic_menu_close_clear_cancel.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/ic_menu_end_conversation.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/ic_menu_friendslist.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/ic_menu_invite.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/ic_menu_login.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/ic_menu_manage.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/icon.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/logo.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/not_in_the_roster.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/scrollbar_vertical_thumb.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/scrollbar_vertical_track.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/shape_border_green.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/shape_line_green.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/status_available.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/status_away.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/status_blocked.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/status_dnd.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/status_error.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/status_icon.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/status_idle.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/status_invisible.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/status_new_message.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/status_offline.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/status_requested.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/drawable/status_typing.png diff -r 2655ee22df9f -r 6cbb9b3117b7 res/layout/addcontact.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/layout/changestatus.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/layout/chat.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/layout/chat_msg_row.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/layout/contactdialogaliasdialog.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/layout/contactlist.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/layout/contactlist_group.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/layout/contactlist_groupstub.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/layout/contactlistcontact.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/layout/create_account.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/layout/group_list.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/layout/jingle_call_activity.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/layout/login.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/layout/login_anim.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/layout/preferences.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/layout/privacy_list.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/layout/privacy_list_create_dialog.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/layout/subscription.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/layout/wizard_account.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/layout/wizard_account_configure.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/menu/chat.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/menu/contact_list.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/menu/contactlist_context.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/menu/create_account.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/menu/edit_settings.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/menu/login.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/menu/privacy_list.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/menu/privacy_list_context.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/values-de/strings.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/values-es/strings.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/values-fr/strings.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/values-ru/strings.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/values-zh-rCN/strings.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/values-zh-rTW/strings.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/values/arrays.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/values/colors.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/values/strings.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 res/values/styles.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/BeemApplication.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/BeemService.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/package-info.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/BeemCapsManager.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/BeemChatManager.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/ChatAdapter.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/Contact.aidl diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/Contact.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/LoginAsyncTask.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/Message.aidl diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/Message.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/PresenceAdapter.aidl diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/PresenceAdapter.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/PrivacyListItem.aidl diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/PrivacyListItem.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/PrivacyListManagerAdapter.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/RosterAdapter.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/XmppConnectionAdapter.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/XmppFacade.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/aidl/IBeemConnectionListener.aidl diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/aidl/IBeemRosterListener.aidl diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/aidl/IChat.aidl diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/aidl/IChatManager.aidl diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/aidl/IChatManagerListener.aidl diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/aidl/IContact.aidl diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/aidl/IMessageListener.aidl diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/aidl/IPrivacyListListener.aidl diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/aidl/IPrivacyListManager.aidl diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/aidl/IRoster.aidl diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/aidl/IXmppConnection.aidl diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/aidl/IXmppFacade.aidl diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/service/package-info.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/smack/caps/CapsExtension.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/smack/caps/CapsManager.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/smack/caps/CapsProvider.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/smack/caps/package-info.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/ui/AddContact.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/ui/ChangeStatus.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/ui/Chat.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/ui/ContactList.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/ui/CreateAccount.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/ui/GroupList.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/ui/Login.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/ui/LoginAnim.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/ui/PrivacyList.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/ui/Settings.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/ui/Subscription.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/ui/dialogs/builders/Alias.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/ui/dialogs/builders/ChatList.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/ui/dialogs/builders/CreatePrivacyList.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/ui/dialogs/builders/DeleteContact.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/ui/dialogs/builders/DeletePrivacyList.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/ui/dialogs/builders/ResendSubscription.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/ui/dialogs/builders/package-info.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/ui/package-info.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/ui/wizard/Account.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/ui/wizard/AccountConfigure.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/ui/wizard/package-info.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/utils/BeemBroadcastReceiver.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/utils/BeemConnectivity.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/utils/FreePort.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/utils/PresenceType.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/utils/SortedList.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/utils/Status.java diff -r 2655ee22df9f -r 6cbb9b3117b7 src/com/beem/project/beem/utils/package-info.java diff -r 2655ee22df9f -r 6cbb9b3117b7 tools/JavaHeaderCheck.regex diff -r 2655ee22df9f -r 6cbb9b3117b7 tools/LicenseHeader.txt diff -r 2655ee22df9f -r 6cbb9b3117b7 tools/README diff -r 2655ee22df9f -r 6cbb9b3117b7 tools/checkstyle.xml diff -r 2655ee22df9f -r 6cbb9b3117b7 tools/eclipse_formatter.xml