Commit 0dfa1477 authored by Grigory Fedorov's avatar Grigory Fedorov

Merge branch 'next-gen' into develop

Conflicts:
	.gitignore
	app/build.gradle
	app/libs/otr4j.jar
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/xabber/android/data/Application.java
	app/src/main/java/com/xabber/android/data/account/AccountTable.java
	app/src/main/java/com/xabber/android/data/connection/ConnectionThread.java
	app/src/main/java/com/xabber/android/service/XabberService.java
	app/src/main/java/com/xabber/android/ui/ChatViewer.java
	app/src/main/java/com/xabber/android/ui/ContactList.java
	app/src/main/java/com/xabber/android/ui/adapter/AccountToggleAdapter.java
	app/src/main/java/com/xabber/android/ui/adapter/ChatViewerAdapter.java
	app/src/main/java/com/xabber/android/ui/adapter/OnTextChangedListener.java
	app/src/main/java/com/xabber/android/ui/dialog/AccountChooseDialogBuilder.java
	app/src/main/java/com/xabber/android/ui/dialog/ExportChatDialogBuilder.java
	app/src/main/java/com/xabber/android/ui/dialog/GroupAddDialogBuilder.java
	app/src/main/java/com/xabber/android/ui/dialog/GroupRenameDialogBuilder.java
	app/src/main/java/com/xabber/android/ui/helper/ManagedActivity.java
	app/src/main/java/com/xabber/android/ui/helper/ManagedListActivity.java
	app/src/main/res/drawable-hdpi-v4/account_background_1.png
	app/src/main/res/drawable-hdpi-v4/account_background_2.png
	app/src/main/res/drawable-hdpi-v4/account_background_3.png
	app/src/main/res/drawable-hdpi-v4/account_background_4.png
	app/src/main/res/drawable-hdpi-v4/account_border_1_normal.png
	app/src/main/res/drawable-hdpi-v4/account_border_1_pressed.png
	app/src/main/res/drawable-hdpi-v4/account_border_2_normal.png
	app/src/main/res/drawable-hdpi-v4/account_border_2_pressed.png
	app/src/main/res/drawable-hdpi-v4/account_border_3_normal.png
	app/src/main/res/drawable-hdpi-v4/account_border_3_pressed.png
	app/src/main/res/drawable-hdpi-v4/account_border_4_normal.png
	app/src/main/res/drawable-hdpi-v4/account_border_4_pressed.png
	app/src/main/res/drawable-hdpi-v4/account_border_disabled.png
	app/src/main/res/drawable-hdpi-v4/account_color_1.png
	app/src/main/res/drawable-hdpi-v4/account_color_2.png
	app/src/main/res/drawable-hdpi-v4/account_color_3.png
	app/src/main/res/drawable-hdpi-v4/account_color_4.png
	app/src/main/res/drawable-hdpi-v4/active_chat_focused.9.png
	app/src/main/res/drawable-hdpi-v4/active_chat_normal.9.png
	app/src/main/res/drawable-hdpi-v4/active_chat_pressed.9.png
	app/src/main/res/drawable-hdpi-v4/avatar_account_1.png
	app/src/main/res/drawable-hdpi-v4/avatar_account_2.png
	app/src/main/res/drawable-hdpi-v4/avatar_account_3.png
	app/src/main/res/drawable-hdpi-v4/avatar_account_4.png
	app/src/main/res/drawable-hdpi-v4/btn_status_mode_focused.9.png
	app/src/main/res/drawable-hdpi-v4/btn_status_mode_normal.9.png
	app/src/main/res/drawable-hdpi-v4/btn_status_mode_pressed.9.png
	app/src/main/res/drawable-hdpi-v4/btn_title_back_normal.png
	app/src/main/res/drawable-hdpi-v4/btn_title_back_pressed.png
	app/src/main/res/drawable-hdpi-v4/chat_bg_1.png
	app/src/main/res/drawable-hdpi-v4/chat_bg_2.png
	app/src/main/res/drawable-hdpi-v4/chat_bg_3.png
	app/src/main/res/drawable-hdpi-v4/chat_bg_4.png
	app/src/main/res/drawable-hdpi-v4/chat_border.9.png
	app/src/main/res/drawable-hdpi-v4/emo_im_angel.png
	app/src/main/res/drawable-hdpi-v4/emo_im_cool.png
	app/src/main/res/drawable-hdpi-v4/emo_im_crying.png
	app/src/main/res/drawable-hdpi-v4/emo_im_foot_in_mouth.png
	app/src/main/res/drawable-hdpi-v4/emo_im_happy.png
	app/src/main/res/drawable-hdpi-v4/emo_im_kissing.png
	app/src/main/res/drawable-hdpi-v4/emo_im_laughing.png
	app/src/main/res/drawable-hdpi-v4/emo_im_lips_are_sealed.png
	app/src/main/res/drawable-hdpi-v4/emo_im_money_mouth.png
	app/src/main/res/drawable-hdpi-v4/emo_im_sad.png
	app/src/main/res/drawable-hdpi-v4/emo_im_surprised.png
	app/src/main/res/drawable-hdpi-v4/emo_im_tongue_sticking_out.png
	app/src/main/res/drawable-hdpi-v4/emo_im_undecided.png
	app/src/main/res/drawable-hdpi-v4/emo_im_winking.png
	app/src/main/res/drawable-hdpi-v4/emo_im_wtf.png
	app/src/main/res/drawable-hdpi-v4/emo_im_yelling.png
	app/src/main/res/drawable-hdpi-v4/expander_account_1_dark_focused.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_1_dark_long.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_1_dark_normal.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_1_dark_pressed.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_1_light_focused.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_1_light_long.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_1_light_normal.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_1_light_pressed.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_2_dark_focused.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_2_dark_long.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_2_dark_normal.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_2_dark_pressed.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_2_light_focused.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_2_light_long.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_2_light_normal.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_2_light_pressed.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_3_dark_focused.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_3_dark_long.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_3_dark_normal.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_3_dark_pressed.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_3_light_focused.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_3_light_long.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_3_light_normal.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_3_light_pressed.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_4_dark_focused.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_4_dark_long.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_4_dark_normal.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_4_dark_pressed.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_4_light_focused.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_4_light_long.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_4_light_normal.9.png
	app/src/main/res/drawable-hdpi-v4/expander_account_4_light_pressed.9.png
	app/src/main/res/drawable-hdpi-v4/expander_group_dark_focused.9.png
	app/src/main/res/drawable-hdpi-v4/expander_group_dark_normal.9.png
	app/src/main/res/drawable-hdpi-v4/expander_group_dark_pressed.9.png
	app/src/main/res/drawable-hdpi-v4/expander_group_light_focused.9.png
	app/src/main/res/drawable-hdpi-v4/expander_group_light_normal.9.png
	app/src/main/res/drawable-hdpi-v4/expander_group_light_pressed.9.png
	app/src/main/res/drawable-hdpi-v4/expander_indicator_dark_hidden.png
	app/src/main/res/drawable-hdpi-v4/expander_indicator_dark_show.png
	app/src/main/res/drawable-hdpi-v4/expander_indicator_light_hidden.png
	app/src/main/res/drawable-hdpi-v4/expander_indicator_light_show.png
	app/src/main/res/drawable-hdpi-v4/ic_client_adium.png
	app/src/main/res/drawable-hdpi-v4/ic_client_empathy.png
	app/src/main/res/drawable-hdpi-v4/ic_client_gajim.png
	app/src/main/res/drawable-hdpi-v4/ic_client_gtalk.png
	app/src/main/res/drawable-hdpi-v4/ic_client_ichat.png
	app/src/main/res/drawable-hdpi-v4/ic_client_miranda.png
	app/src/main/res/drawable-hdpi-v4/ic_client_pidgin.png
	app/src/main/res/drawable-hdpi-v4/ic_client_psi.png
	app/src/main/res/drawable-hdpi-v4/ic_client_qip.png
	app/src/main/res/drawable-hdpi-v4/ic_client_vip.png
	app/src/main/res/drawable-hdpi-v4/ic_client_xabber.png
	app/src/main/res/drawable-hdpi-v4/ic_information.png
	app/src/main/res/drawable-hdpi-v4/ic_menu_allfriends.png
	app/src/main/res/drawable-hdpi-v4/ic_menu_archive.png
	app/src/main/res/drawable-hdpi-v4/ic_menu_blocked_user.png
	app/src/main/res/drawable-hdpi-v4/ic_menu_chat_dashboard.png
	app/src/main/res/drawable-hdpi-v4/ic_menu_end_conversation.png
	app/src/main/res/drawable-hdpi-v4/ic_menu_friendslist.png
	app/src/main/res/drawable-hdpi-v4/ic_menu_invite.png
	app/src/main/res/drawable-hdpi-v4/ic_menu_notifications.png
	app/src/main/res/drawable-hdpi-v4/ic_menu_stop.png
	app/src/main/res/drawable-hdpi-v4/ic_message_delivered.png
	app/src/main/res/drawable-hdpi-v4/ic_message_has_error.png
	app/src/main/res/drawable-hdpi-v4/ic_message_not_delivered.png
	app/src/main/res/drawable-hdpi-v4/ic_message_not_sent.png
	app/src/main/res/drawable-hdpi-v4/ic_security_encripted.png
	app/src/main/res/drawable-hdpi-v4/ic_security_finished.png
	app/src/main/res/drawable-hdpi-v4/ic_security_plain.png
	app/src/main/res/drawable-hdpi-v4/ic_security_verified.png
	app/src/main/res/drawable-hdpi-v4/ic_show_offline_always.9.png
	app/src/main/res/drawable-hdpi-v4/ic_show_offline_never.9.png
	app/src/main/res/drawable-hdpi-v4/ic_stat_attention.png
	app/src/main/res/drawable-hdpi-v4/ic_stat_auth_failed.png
	app/src/main/res/drawable-hdpi-v4/ic_stat_message.png
	app/src/main/res/drawable-hdpi-v4/ic_stat_message_offline.png
	app/src/main/res/drawable-hdpi-v4/ic_stat_normal.png
	app/src/main/res/drawable-hdpi-v4/ic_stat_offline.png
	app/src/main/res/drawable-hdpi-v4/ic_stat_play.png
	app/src/main/res/drawable-hdpi-v4/ic_stat_request.png
	app/src/main/res/drawable-hdpi-v4/ic_stat_subscribe.png
	app/src/main/res/drawable-hdpi-v4/ic_status_available.png
	app/src/main/res/drawable-hdpi-v4/ic_status_available_account.png
	app/src/main/res/drawable-hdpi-v4/ic_status_away.png
	app/src/main/res/drawable-hdpi-v4/ic_status_away_account.png
	app/src/main/res/drawable-hdpi-v4/ic_status_chat.png
	app/src/main/res/drawable-hdpi-v4/ic_status_chat_account.png
	app/src/main/res/drawable-hdpi-v4/ic_status_connection.png
	app/src/main/res/drawable-hdpi-v4/ic_status_connection_account.png
	app/src/main/res/drawable-hdpi-v4/ic_status_dnd.png
	app/src/main/res/drawable-hdpi-v4/ic_status_dnd_account.png
	app/src/main/res/drawable-hdpi-v4/ic_status_invisible.png
	app/src/main/res/drawable-hdpi-v4/ic_status_unavailable.png
	app/src/main/res/drawable-hdpi-v4/ic_status_unavailable_account.png
	app/src/main/res/drawable-hdpi-v4/ic_status_unsubscribed.png
	app/src/main/res/drawable-hdpi-v4/ic_status_xa.png
	app/src/main/res/drawable-hdpi-v4/ic_status_xa_account.png
	app/src/main/res/drawable-hdpi-v4/notify_panel_notification_icon_bg.png
	app/src/main/res/drawable-hdpi-v4/shadow.png
	app/src/main/res/drawable-hdpi-v4/title_account_background_1_dark.9.png
	app/src/main/res/drawable-hdpi-v4/title_account_background_1_light.9.png
	app/src/main/res/drawable-hdpi-v4/title_account_background_2_dark.9.png
	app/src/main/res/drawable-hdpi-v4/title_account_background_2_light.9.png
	app/src/main/res/drawable-hdpi-v4/title_account_background_3_dark.9.png
	app/src/main/res/drawable-hdpi-v4/title_account_background_3_light.9.png
	app/src/main/res/drawable-hdpi-v4/title_account_background_4_dark.9.png
	app/src/main/res/drawable-hdpi-v4/title_account_background_4_light.9.png
	app/src/main/res/drawable-hdpi-v4/title_logo.9.png
	app/src/main/res/drawable-hdpi-v4/title_main_background_dark.9.png
	app/src/main/res/drawable-hdpi-v4/title_main_background_light.9.png
	app/src/main/res/drawable-hdpi/account_background_1.png
	app/src/main/res/drawable-hdpi/account_background_2.png
	app/src/main/res/drawable-hdpi/account_background_3.png
	app/src/main/res/drawable-hdpi/account_background_4.png
	app/src/main/res/drawable-hdpi/account_border_1_normal.png
	app/src/main/res/drawable-hdpi/account_border_1_pressed.png
	app/src/main/res/drawable-hdpi/account_border_2_normal.png
	app/src/main/res/drawable-hdpi/account_border_2_pressed.png
	app/src/main/res/drawable-hdpi/account_border_3_normal.png
	app/src/main/res/drawable-hdpi/account_border_3_pressed.png
	app/src/main/res/drawable-hdpi/account_border_4_normal.png
	app/src/main/res/drawable-hdpi/account_border_4_pressed.png
	app/src/main/res/drawable-hdpi/account_border_disabled.png
	app/src/main/res/drawable-hdpi/account_color_1.png
	app/src/main/res/drawable-hdpi/account_color_2.png
	app/src/main/res/drawable-hdpi/account_color_3.png
	app/src/main/res/drawable-hdpi/account_color_4.png
	app/src/main/res/drawable-hdpi/active_chat_focused.9.png
	app/src/main/res/drawable-hdpi/active_chat_normal.9.png
	app/src/main/res/drawable-hdpi/active_chat_pressed.9.png
	app/src/main/res/drawable-hdpi/avatar_account_1.png
	app/src/main/res/drawable-hdpi/avatar_account_2.png
	app/src/main/res/drawable-hdpi/avatar_account_3.png
	app/src/main/res/drawable-hdpi/avatar_account_4.png
	app/src/main/res/drawable-hdpi/btn_status_mode_focused.9.png
	app/src/main/res/drawable-hdpi/btn_status_mode_normal.9.png
	app/src/main/res/drawable-hdpi/btn_status_mode_pressed.9.png
	app/src/main/res/drawable-hdpi/btn_title_back_normal.png
	app/src/main/res/drawable-hdpi/btn_title_back_pressed.png
	app/src/main/res/drawable-hdpi/chat_bg_1.png
	app/src/main/res/drawable-hdpi/chat_bg_2.png
	app/src/main/res/drawable-hdpi/chat_bg_3.png
	app/src/main/res/drawable-hdpi/chat_bg_4.png
	app/src/main/res/drawable-hdpi/chat_border.9.png
	app/src/main/res/drawable-hdpi/emo_im_angel.png
	app/src/main/res/drawable-hdpi/emo_im_cool.png
	app/src/main/res/drawable-hdpi/emo_im_crying.png
	app/src/main/res/drawable-hdpi/emo_im_foot_in_mouth.png
	app/src/main/res/drawable-hdpi/emo_im_happy.png
	app/src/main/res/drawable-hdpi/emo_im_kissing.png
	app/src/main/res/drawable-hdpi/emo_im_laughing.png
	app/src/main/res/drawable-hdpi/emo_im_lips_are_sealed.png
	app/src/main/res/drawable-hdpi/emo_im_money_mouth.png
	app/src/main/res/drawable-hdpi/emo_im_sad.png
	app/src/main/res/drawable-hdpi/emo_im_surprised.png
	app/src/main/res/drawable-hdpi/emo_im_tongue_sticking_out.png
	app/src/main/res/drawable-hdpi/emo_im_undecided.png
	app/src/main/res/drawable-hdpi/emo_im_winking.png
	app/src/main/res/drawable-hdpi/emo_im_wtf.png
	app/src/main/res/drawable-hdpi/emo_im_yelling.png
	app/src/main/res/drawable-hdpi/expander_account_1_dark_focused.9.png
	app/src/main/res/drawable-hdpi/expander_account_1_dark_long.9.png
	app/src/main/res/drawable-hdpi/expander_account_1_dark_normal.9.png
	app/src/main/res/drawable-hdpi/expander_account_1_dark_pressed.9.png
	app/src/main/res/drawable-hdpi/expander_account_1_light_focused.9.png
	app/src/main/res/drawable-hdpi/expander_account_1_light_long.9.png
	app/src/main/res/drawable-hdpi/expander_account_1_light_normal.9.png
	app/src/main/res/drawable-hdpi/expander_account_1_light_pressed.9.png
	app/src/main/res/drawable-hdpi/expander_account_2_dark_focused.9.png
	app/src/main/res/drawable-hdpi/expander_account_2_dark_long.9.png
	app/src/main/res/drawable-hdpi/expander_account_2_dark_normal.9.png
	app/src/main/res/drawable-hdpi/expander_account_2_dark_pressed.9.png
	app/src/main/res/drawable-hdpi/expander_account_2_light_focused.9.png
	app/src/main/res/drawable-hdpi/expander_account_2_light_long.9.png
	app/src/main/res/drawable-hdpi/expander_account_2_light_normal.9.png
	app/src/main/res/drawable-hdpi/expander_account_2_light_pressed.9.png
	app/src/main/res/drawable-hdpi/expander_account_3_dark_focused.9.png
	app/src/main/res/drawable-hdpi/expander_account_3_dark_long.9.png
	app/src/main/res/drawable-hdpi/expander_account_3_dark_normal.9.png
	app/src/main/res/drawable-hdpi/expander_account_3_dark_pressed.9.png
	app/src/main/res/drawable-hdpi/expander_account_3_light_focused.9.png
	app/src/main/res/drawable-hdpi/expander_account_3_light_long.9.png
	app/src/main/res/drawable-hdpi/expander_account_3_light_normal.9.png
	app/src/main/res/drawable-hdpi/expander_account_3_light_pressed.9.png
	app/src/main/res/drawable-hdpi/expander_account_4_dark_focused.9.png
	app/src/main/res/drawable-hdpi/expander_account_4_dark_long.9.png
	app/src/main/res/drawable-hdpi/expander_account_4_dark_normal.9.png
	app/src/main/res/drawable-hdpi/expander_account_4_dark_pressed.9.png
	app/src/main/res/drawable-hdpi/expander_account_4_light_focused.9.png
	app/src/main/res/drawable-hdpi/expander_account_4_light_long.9.png
	app/src/main/res/drawable-hdpi/expander_account_4_light_normal.9.png
	app/src/main/res/drawable-hdpi/expander_account_4_light_pressed.9.png
	app/src/main/res/drawable-hdpi/expander_group_dark_focused.9.png
	app/src/main/res/drawable-hdpi/expander_group_dark_normal.9.png
	app/src/main/res/drawable-hdpi/expander_group_dark_pressed.9.png
	app/src/main/res/drawable-hdpi/expander_group_light_focused.9.png
	app/src/main/res/drawable-hdpi/expander_group_light_normal.9.png
	app/src/main/res/drawable-hdpi/expander_group_light_pressed.9.png
	app/src/main/res/drawable-hdpi/expander_indicator_dark_hidden.png
	app/src/main/res/drawable-hdpi/expander_indicator_dark_show.png
	app/src/main/res/drawable-hdpi/expander_indicator_light_hidden.png
	app/src/main/res/drawable-hdpi/expander_indicator_light_show.png
	app/src/main/res/drawable-hdpi/ic_client_adium.png
	app/src/main/res/drawable-hdpi/ic_client_empathy.png
	app/src/main/res/drawable-hdpi/ic_client_gajim.png
	app/src/main/res/drawable-hdpi/ic_client_gtalk.png
	app/src/main/res/drawable-hdpi/ic_client_ichat.png
	app/src/main/res/drawable-hdpi/ic_client_miranda.png
	app/src/main/res/drawable-hdpi/ic_client_pidgin.png
	app/src/main/res/drawable-hdpi/ic_client_psi.png
	app/src/main/res/drawable-hdpi/ic_client_qip.png
	app/src/main/res/drawable-hdpi/ic_client_vip.png
	app/src/main/res/drawable-hdpi/ic_client_xabber.png
	app/src/main/res/drawable-hdpi/ic_connect.png
	app/src/main/res/drawable-hdpi/ic_disconnect.png
	app/src/main/res/drawable-hdpi/ic_information.png
	app/src/main/res/drawable-hdpi/ic_launcher.png
	app/src/main/res/drawable-hdpi/ic_menu_allfriends.png
	app/src/main/res/drawable-hdpi/ic_menu_archive.png
	app/src/main/res/drawable-hdpi/ic_menu_blocked_user.png
	app/src/main/res/drawable-hdpi/ic_menu_chat_dashboard.png
	app/src/main/res/drawable-hdpi/ic_menu_end_conversation.png
	app/src/main/res/drawable-hdpi/ic_menu_friendslist.png
	app/src/main/res/drawable-hdpi/ic_menu_invite.png
	app/src/main/res/drawable-hdpi/ic_menu_notifications.png
	app/src/main/res/drawable-hdpi/ic_menu_stop.png
	app/src/main/res/drawable-hdpi/ic_message_delivered.png
	app/src/main/res/drawable-hdpi/ic_message_has_error.png
	app/src/main/res/drawable-hdpi/ic_message_not_delivered.png
	app/src/main/res/drawable-hdpi/ic_message_not_sent.png
	app/src/main/res/drawable-hdpi/ic_security_encripted.png
	app/src/main/res/drawable-hdpi/ic_security_finished.png
	app/src/main/res/drawable-hdpi/ic_security_plain.png
	app/src/main/res/drawable-hdpi/ic_security_verified.png
	app/src/main/res/drawable-hdpi/ic_show_offline_always.9.png
	app/src/main/res/drawable-hdpi/ic_show_offline_never.9.png
	app/src/main/res/drawable-hdpi/ic_stat_attention.png
	app/src/main/res/drawable-hdpi/ic_stat_auth_failed.png
	app/src/main/res/drawable-hdpi/ic_stat_message.png
	app/src/main/res/drawable-hdpi/ic_stat_message_offline.png
	app/src/main/res/drawable-hdpi/ic_stat_normal.png
	app/src/main/res/drawable-hdpi/ic_stat_offline.png
	app/src/main/res/drawable-hdpi/ic_stat_play.png
	app/src/main/res/drawable-hdpi/ic_stat_request.png
	app/src/main/res/drawable-hdpi/ic_stat_subscribe.png
	app/src/main/res/drawable-hdpi/ic_status_available.png
	app/src/main/res/drawable-hdpi/ic_status_available_account.png
	app/src/main/res/drawable-hdpi/ic_status_away.png
	app/src/main/res/drawable-hdpi/ic_status_away_account.png
	app/src/main/res/drawable-hdpi/ic_status_chat.png
	app/src/main/res/drawable-hdpi/ic_status_chat_account.png
	app/src/main/res/drawable-hdpi/ic_status_connection.png
	app/src/main/res/drawable-hdpi/ic_status_connection_account.png
	app/src/main/res/drawable-hdpi/ic_status_dnd.png
	app/src/main/res/drawable-hdpi/ic_status_dnd_account.png
	app/src/main/res/drawable-hdpi/ic_status_invisible.png
	app/src/main/res/drawable-hdpi/ic_status_unavailable.png
	app/src/main/res/drawable-hdpi/ic_status_unavailable_account.png
	app/src/main/res/drawable-hdpi/ic_status_unsubscribed.png
	app/src/main/res/drawable-hdpi/ic_status_xa.png
	app/src/main/res/drawable-hdpi/ic_status_xa_account.png
	app/src/main/res/drawable-hdpi/notify_panel_notification_icon_bg.png
	app/src/main/res/drawable-hdpi/shadow.png
	app/src/main/res/drawable-hdpi/title_account_background_1_dark.9.png
	app/src/main/res/drawable-hdpi/title_account_background_1_light.9.png
	app/src/main/res/drawable-hdpi/title_account_background_2_dark.9.png
	app/src/main/res/drawable-hdpi/title_account_background_2_light.9.png
	app/src/main/res/drawable-hdpi/title_account_background_3_dark.9.png
	app/src/main/res/drawable-hdpi/title_account_background_3_light.9.png
	app/src/main/res/drawable-hdpi/title_account_background_4_dark.9.png
	app/src/main/res/drawable-hdpi/title_account_background_4_light.9.png
	app/src/main/res/drawable-hdpi/title_logo.9.png
	app/src/main/res/drawable-hdpi/title_main_background_dark.9.png
	app/src/main/res/drawable-hdpi/title_main_background_light.9.png
	app/src/main/res/drawable-xhdpi-v4/notify_panel_notification_icon_bg.png
	app/src/main/res/drawable-xhdpi/notify_panel_notification_icon_bg.png
	app/src/main/res/drawable/btn_status_mode.xml
	app/src/main/res/drawable/ic_connect.png
	app/src/main/res/drawable/ic_disconnect.png
	app/src/main/res/drawable/ic_launcher.png
	app/src/main/res/layout-v5/base_contact_avatar.xml
	app/src/main/res/layout-v5/contact_title_avatar.xml
	app/src/main/res/layout/base_contact_avatar.xml
	app/src/main/res/layout/chat_viewer_container.xml
	app/src/main/res/layout/contact_list.xml
	app/src/main/res/layout/contact_title_avatar.xml
	app/src/main/res/values-es/about_viewer.xml
	app/src/main/res/values-es/account_editor.xml
	app/src/main/res/values-es/account_list.xml
	app/src/main/res/values-es/chat_viewer.xml
	app/src/main/res/values-es/contact_editor.xml
	app/src/main/res/values-es/contact_list.xml
	app/src/main/res/values-es/contact_viewer.xml
	app/src/main/res/values-es/fingerprint_viewer.xml
	app/src/main/res/values-es/market.xml
	app/src/main/res/values-es/muc_editor.xml
	app/src/main/res/values-es/notification_bar.xml
	app/src/main/res/values-es/preference_editor.xml
	app/src/main/res/values-es/secret_viewer.xml
	app/src/main/res/values-es/status_editor.xml
	app/src/main/res/values-es/words.xml
	app/src/main/res/values-fr/about_viewer.xml
	app/src/main/res/values-fr/account_editor.xml
	app/src/main/res/values-fr/account_list.xml
	app/src/main/res/values-fr/change_log.xml
	app/src/main/res/values-fr/chat_viewer.xml
	app/src/main/res/values-fr/contact_editor.xml
	app/src/main/res/values-fr/contact_list.xml
	app/src/main/res/values-fr/contact_viewer.xml
	app/src/main/res/values-fr/fingerprint_viewer.xml
	app/src/main/res/values-fr/muc_editor.xml
	app/src/main/res/values-fr/notification_bar.xml
	app/src/main/res/values-fr/preference_editor.xml
	app/src/main/res/values-fr/secret_viewer.xml
	app/src/main/res/values-fr/status_editor.xml
	app/src/main/res/values-fr/words.xml
	app/src/main/res/values-it/about_viewer.xml
	app/src/main/res/values-it/contact_list.xml
	app/src/main/res/values-it/words.xml
	app/src/main/res/values-ja/account_list.xml
	app/src/main/res/values-ja/contact_list.xml
	app/src/main/res/values-ja/secret_viewer.xml
	app/src/main/res/values-ja/status_editor.xml
	app/src/main/res/values-ja/words.xml
	app/src/main/res/values-nl/about_viewer.xml
	app/src/main/res/values-nl/account_editor.xml
	app/src/main/res/values-nl/account_list.xml
	app/src/main/res/values-nl/chat_viewer.xml
	app/src/main/res/values-nl/contact_editor.xml
	app/src/main/res/values-nl/contact_list.xml
	app/src/main/res/values-nl/contact_viewer.xml
	app/src/main/res/values-nl/fingerprint_viewer.xml
	app/src/main/res/values-nl/market.xml
	app/src/main/res/values-nl/muc_editor.xml
	app/src/main/res/values-nl/notification_bar.xml
	app/src/main/res/values-nl/preference_editor.xml
	app/src/main/res/values-nl/secret_viewer.xml
	app/src/main/res/values-nl/status_editor.xml
	app/src/main/res/values-nl/words.xml
	app/src/main/res/values-ru/chat_viewer.xml
	app/src/main/res/values-ru/phrase_editor.xml
	app/src/main/res/values-sk/about_viewer.xml
	app/src/main/res/values-sk/account_editor.xml
	app/src/main/res/values-sk/account_list.xml
	app/src/main/res/values-sk/change_log.xml
	app/src/main/res/values-sk/chat_viewer.xml
	app/src/main/res/values-sk/contact_editor.xml
	app/src/main/res/values-sk/contact_list.xml
	app/src/main/res/values-sk/contact_viewer.xml
	app/src/main/res/values-sk/fingerprint_viewer.xml
	app/src/main/res/values-sk/market.xml
	app/src/main/res/values-sk/muc_editor.xml
	app/src/main/res/values-sk/notification_bar.xml
	app/src/main/res/values-sk/preference_editor.xml
	app/src/main/res/values-sk/secret_viewer.xml
	app/src/main/res/values-sk/status_editor.xml
	app/src/main/res/values-sk/words.xml
	app/src/main/res/values-sv-rSE/about_viewer.xml
	app/src/main/res/values-sv-rSE/account_list.xml
	app/src/main/res/values-sv-rSE/contact_editor.xml
	app/src/main/res/values-sv-rSE/contact_viewer.xml
	app/src/main/res/values-sv-rSE/muc_editor.xml
	app/src/main/res/values-sv-rSE/notification_bar.xml
	app/src/main/res/values-sv-rSE/status_editor.xml
	app/src/main/res/values-sv-rSE/words.xml
	app/src/main/res/values-zh-rCN/account_editor.xml
	app/src/main/res/values-zh-rCN/account_list.xml
	app/src/main/res/values-zh-rCN/contact_editor.xml
	app/src/main/res/values-zh-rCN/contact_viewer.xml
	app/src/main/res/values-zh-rCN/secret_viewer.xml
	app/src/main/res/values-zh-rCN/status_editor.xml
	app/src/main/res/values-zh-rTW/chat_viewer.xml
	app/src/main/res/values-zh-rTW/contact_editor.xml
	app/src/main/res/values-zh-rTW/secret_viewer.xml
	app/src/main/res/values/connections.xml
	app/src/main/res/values/phrase_editor.xml
	app/src/main/res/values/versions.xml
	gradlew.bat
	res/drawable-hdpi-v4/account_background_1.png
	res/drawable-hdpi-v4/account_background_2.png
	res/drawable-hdpi-v4/account_background_3.png
	res/drawable-hdpi-v4/account_background_4.png
	res/drawable-hdpi-v4/account_border_1_normal.png
	res/drawable-hdpi-v4/account_border_1_pressed.png
	res/drawable-hdpi-v4/account_border_2_normal.png
	res/drawable-hdpi-v4/account_border_2_pressed.png
	res/drawable-hdpi-v4/account_border_3_normal.png
	res/drawable-hdpi-v4/account_border_3_pressed.png
	res/drawable-hdpi-v4/account_border_4_normal.png
	res/drawable-hdpi-v4/account_border_4_pressed.png
	res/drawable-hdpi-v4/account_border_disabled.png
	res/drawable-hdpi-v4/account_color_1.png
	res/drawable-hdpi-v4/account_color_2.png
	res/drawable-hdpi-v4/account_color_3.png
	res/drawable-hdpi-v4/account_color_4.png
	res/drawable-hdpi-v4/active_chat_focused.9.png
	res/drawable-hdpi-v4/active_chat_normal.9.png
	res/drawable-hdpi-v4/active_chat_pressed.9.png
	res/drawable-hdpi-v4/avatar_account_1.png
	res/drawable-hdpi-v4/avatar_account_2.png
	res/drawable-hdpi-v4/avatar_account_3.png
	res/drawable-hdpi-v4/avatar_account_4.png
	res/drawable-hdpi-v4/btn_status_mode_focused.9.png
	res/drawable-hdpi-v4/btn_status_mode_normal.9.png
	res/drawable-hdpi-v4/btn_status_mode_pressed.9.png
	res/drawable-hdpi-v4/btn_title_back_normal.png
	res/drawable-hdpi-v4/btn_title_back_pressed.png
	res/drawable-hdpi-v4/chat_bg_1.png
	res/drawable-hdpi-v4/chat_bg_2.png
	res/drawable-hdpi-v4/chat_bg_3.png
	res/drawable-hdpi-v4/chat_bg_4.png
	res/drawable-hdpi-v4/chat_border.9.png
	res/drawable-hdpi-v4/emo_im_angel.png
	res/drawable-hdpi-v4/emo_im_cool.png
	res/drawable-hdpi-v4/emo_im_crying.png
	res/drawable-hdpi-v4/emo_im_foot_in_mouth.png
	res/drawable-hdpi-v4/emo_im_happy.png
	res/drawable-hdpi-v4/emo_im_kissing.png
	res/drawable-hdpi-v4/emo_im_laughing.png
	res/drawable-hdpi-v4/emo_im_lips_are_sealed.png
	res/drawable-hdpi-v4/emo_im_money_mouth.png
	res/drawable-hdpi-v4/emo_im_sad.png
	res/drawable-hdpi-v4/emo_im_surprised.png
	res/drawable-hdpi-v4/emo_im_tongue_sticking_out.png
	res/drawable-hdpi-v4/emo_im_undecided.png
	res/drawable-hdpi-v4/emo_im_winking.png
	res/drawable-hdpi-v4/emo_im_wtf.png
	res/drawable-hdpi-v4/emo_im_yelling.png
	res/drawable-hdpi-v4/expander_account_1_dark_focused.9.png
	res/drawable-hdpi-v4/expander_account_1_dark_long.9.png
	res/drawable-hdpi-v4/expander_account_1_dark_normal.9.png
	res/drawable-hdpi-v4/expander_account_1_dark_pressed.9.png
	res/drawable-hdpi-v4/expander_account_1_light_focused.9.png
	res/drawable-hdpi-v4/expander_account_1_light_long.9.png
	res/drawable-hdpi-v4/expander_account_1_light_normal.9.png
	res/drawable-hdpi-v4/expander_account_1_light_pressed.9.png
	res/drawable-hdpi-v4/expander_account_2_dark_focused.9.png
	res/drawable-hdpi-v4/expander_account_2_dark_long.9.png
	res/drawable-hdpi-v4/expander_account_2_dark_normal.9.png
	res/drawable-hdpi-v4/expander_account_2_dark_pressed.9.png
	res/drawable-hdpi-v4/expander_account_2_light_focused.9.png
	res/drawable-hdpi-v4/expander_account_2_light_long.9.png
	res/drawable-hdpi-v4/expander_account_2_light_normal.9.png
	res/drawable-hdpi-v4/expander_account_2_light_pressed.9.png
	res/drawable-hdpi-v4/expander_account_3_dark_focused.9.png
	res/drawable-hdpi-v4/expander_account_3_dark_long.9.png
	res/drawable-hdpi-v4/expander_account_3_dark_normal.9.png
	res/drawable-hdpi-v4/expander_account_3_dark_pressed.9.png
	res/drawable-hdpi-v4/expander_account_3_light_focused.9.png
	res/drawable-hdpi-v4/expander_account_3_light_long.9.png
	res/drawable-hdpi-v4/expander_account_3_light_normal.9.png
	res/drawable-hdpi-v4/expander_account_3_light_pressed.9.png
	res/drawable-hdpi-v4/expander_account_4_dark_focused.9.png
	res/drawable-hdpi-v4/expander_account_4_dark_long.9.png
	res/drawable-hdpi-v4/expander_account_4_dark_normal.9.png
	res/drawable-hdpi-v4/expander_account_4_dark_pressed.9.png
	res/drawable-hdpi-v4/expander_account_4_light_focused.9.png
	res/drawable-hdpi-v4/expander_account_4_light_long.9.png
	res/drawable-hdpi-v4/expander_account_4_light_normal.9.png
	res/drawable-hdpi-v4/expander_account_4_light_pressed.9.png
	res/drawable-hdpi-v4/expander_group_dark_focused.9.png
	res/drawable-hdpi-v4/expander_group_dark_normal.9.png
	res/drawable-hdpi-v4/expander_group_dark_pressed.9.png
	res/drawable-hdpi-v4/expander_group_light_focused.9.png
	res/drawable-hdpi-v4/expander_group_light_normal.9.png
	res/drawable-hdpi-v4/expander_group_light_pressed.9.png
	res/drawable-hdpi-v4/expander_indicator_dark_hidden.png
	res/drawable-hdpi-v4/expander_indicator_dark_show.png
	res/drawable-hdpi-v4/expander_indicator_light_hidden.png
	res/drawable-hdpi-v4/expander_indicator_light_show.png
	res/drawable-hdpi-v4/ic_client_adium.png
	res/drawable-hdpi-v4/ic_client_empathy.png
	res/drawable-hdpi-v4/ic_client_gajim.png
	res/drawable-hdpi-v4/ic_client_gtalk.png
	res/drawable-hdpi-v4/ic_client_ichat.png
	res/drawable-hdpi-v4/ic_client_miranda.png
	res/drawable-hdpi-v4/ic_client_pidgin.png
	res/drawable-hdpi-v4/ic_client_psi.png
	res/drawable-hdpi-v4/ic_client_qip.png
	res/drawable-hdpi-v4/ic_client_vip.png
	res/drawable-hdpi-v4/ic_client_xabber.png
	res/drawable-hdpi-v4/ic_information.png
	res/drawable-hdpi-v4/ic_menu_allfriends.png
	res/drawable-hdpi-v4/ic_menu_archive.png
	res/drawable-hdpi-v4/ic_menu_blocked_user.png
	res/drawable-hdpi-v4/ic_menu_chat_dashboard.png
	res/drawable-hdpi-v4/ic_menu_end_conversation.png
	res/drawable-hdpi-v4/ic_menu_friendslist.png
	res/drawable-hdpi-v4/ic_menu_invite.png
	res/drawable-hdpi-v4/ic_menu_notifications.png
	res/drawable-hdpi-v4/ic_menu_stop.png
	res/drawable-hdpi-v4/ic_message_delivered.png
	res/drawable-hdpi-v4/ic_message_has_error.png
	res/drawable-hdpi-v4/ic_message_not_delivered.png
	res/drawable-hdpi-v4/ic_message_not_sent.png
	res/drawable-hdpi-v4/ic_security_encripted.png
	res/drawable-hdpi-v4/ic_security_finished.png
	res/drawable-hdpi-v4/ic_security_plain.png
	res/drawable-hdpi-v4/ic_security_verified.png
	res/drawable-hdpi-v4/ic_show_offline_always.9.png
	res/drawable-hdpi-v4/ic_show_offline_never.9.png
	res/drawable-hdpi-v4/ic_stat_attention.png
	res/drawable-hdpi-v4/ic_stat_auth_failed.png
	res/drawable-hdpi-v4/ic_stat_message.png
	res/drawable-hdpi-v4/ic_stat_message_offline.png
	res/drawable-hdpi-v4/ic_stat_normal.png
	res/drawable-hdpi-v4/ic_stat_offline.png
	res/drawable-hdpi-v4/ic_stat_play.png
	res/drawable-hdpi-v4/ic_stat_request.png
	res/drawable-hdpi-v4/ic_stat_subscribe.png
	res/drawable-hdpi-v4/ic_status_available.png
	res/drawable-hdpi-v4/ic_status_available_account.png
	res/drawable-hdpi-v4/ic_status_away.png
	res/drawable-hdpi-v4/ic_status_away_account.png
	res/drawable-hdpi-v4/ic_status_chat.png
	res/drawable-hdpi-v4/ic_status_chat_account.png
	res/drawable-hdpi-v4/ic_status_connection.png
	res/drawable-hdpi-v4/ic_status_connection_account.png
	res/drawable-hdpi-v4/ic_status_dnd.png
	res/drawable-hdpi-v4/ic_status_dnd_account.png
	res/drawable-hdpi-v4/ic_status_invisible.png
	res/drawable-hdpi-v4/ic_status_unavailable.png
	res/drawable-hdpi-v4/ic_status_unavailable_account.png
	res/drawable-hdpi-v4/ic_status_unsubscribed.png
	res/drawable-hdpi-v4/ic_status_xa.png
	res/drawable-hdpi-v4/ic_status_xa_account.png
	res/drawable-hdpi-v4/notify_panel_notification_icon_bg.png
	res/drawable-hdpi-v4/shadow.png
	res/drawable-hdpi-v4/title_account_background_1_dark.9.png
	res/drawable-hdpi-v4/title_account_background_1_light.9.png
	res/drawable-hdpi-v4/title_account_background_2_dark.9.png
	res/drawable-hdpi-v4/title_account_background_2_light.9.png
	res/drawable-hdpi-v4/title_account_background_3_dark.9.png
	res/drawable-hdpi-v4/title_account_background_3_light.9.png
	res/drawable-hdpi-v4/title_account_background_4_dark.9.png
	res/drawable-hdpi-v4/title_account_background_4_light.9.png
	res/drawable-hdpi-v4/title_logo.9.png
	res/drawable-hdpi-v4/title_main_background_dark.9.png
	res/drawable-hdpi-v4/title_main_background_light.9.png
	res/drawable-xhdpi-v4/notify_panel_notification_icon_bg.png
	res/layout-v5/contact_title_avatar.xml
	res/layout/contact_title_avatar.xml
parents f2119c6e 9cd3c354
apply plugin: 'com.android.application'
android {
compileSdkVersion 9
buildToolsVersion "21.1.2"
compileSdkVersion 21
buildToolsVersion "21.1.1"
defaultConfig {
applicationId "com.xabber.androiddev"
minSdkVersion 3
targetSdkVersion 9
minSdkVersion 7
targetSdkVersion 21
}
buildTypes {
......@@ -20,4 +20,5 @@ android {
dependencies {
compile files('libs/otr4j.jar')
compile 'com.android.support:support-v4:21.0.3'
}
......@@ -19,6 +19,7 @@
android:installLocation="auto"
>
<application
android:debuggable="true"
android:label="@string/application_name"
android:icon="@drawable/ic_launcher"
android:name="com.xabber.android.data.Application"
......@@ -169,6 +170,12 @@
android:name="com.xabber.android.ui.OpenSourceViewer"
android:theme="@style/Theme.NoTitleBar"
/>
<activity
android:name="com.xabber.android.ui.ContactSubscription"
/>
<activity
android:name="com.xabber.android.ui.MUCInvite"
/>
<activity
android:name="com.xabber.android.ui.CertificateConfirmation"
/>
......@@ -234,7 +241,7 @@
<receiver android:name="com.xabber.android.receiver.GoXaReceiver" />
<receiver android:name="com.xabber.android.receiver.ComposingPausedReceiver" />
</application>
<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="9" />
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="16"/>
<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
<uses-feature android:name="android.hardware.location" android:required="false" />
<uses-feature android:name="android.hardware.location.gps" android:required="false" />
......
......@@ -28,6 +28,7 @@ import org.jivesoftware.smack.util.StringUtils;
import android.content.res.TypedArray;
import android.database.Cursor;
import android.os.Build;
import com.xabber.android.data.Application;
import com.xabber.android.data.NetworkException;
......@@ -134,7 +135,7 @@ public class AccountManager implements OnLoadListener, OnWipeListener {
TypedArray values = application.getResources().obtainTypedArray(id);
AccountProtocol protocol = AccountProtocol.valueOf(values
.getString(0));
if (Application.SDK_INT < 8 && protocol == AccountProtocol.wlm) {
if (Build.VERSION.SDK_INT < 8 && protocol == AccountProtocol.wlm) {
values.recycle();
continue;
}
......
......@@ -14,6 +14,8 @@
*/
package com.xabber.android.data.connection;
import android.os.Build;
import java.net.InetAddress;
import java.security.cert.CertificateException;
import java.util.concurrent.ExecutorService;
......@@ -282,7 +284,7 @@ public class ConnectionThread implements
proxyUser, proxyPassword);
ConnectionConfiguration connectionConfiguration = new ConnectionConfiguration(
address.getHostAddress(), port, serverName, proxy);
if (Application.SDK_INT >= 14) {
if (Build.VERSION.SDK_INT >= 14) {
connectionConfiguration.setTruststoreType("AndroidCAStore");
connectionConfiguration.setTruststorePassword(null);
connectionConfiguration.setTruststorePath(null);
......
......@@ -392,7 +392,8 @@ public class NotificationManager implements OnInitializedListener,
chatViews.setTextViewText(R.id.text, status);
Notification notification = new Notification();
if (Application.SDK_INT >= 14 && SettingsManager.eventsPersistent()) {
if (Build.VERSION.SDK_INT >= 14
&& SettingsManager.eventsPersistent()) {
// Ongoing icons are in the left side, so hide this one.
notification.icon = R.drawable.ic_placeholder;
notification.when = Long.MIN_VALUE;
......@@ -430,7 +431,7 @@ public class NotificationManager implements OnInitializedListener,
persistentNotification.defaults = 0;
persistentNotification.sound = null;
persistentNotification.tickerText = null;
if (Application.SDK_INT >= 14 && SettingsManager.eventsPersistent()) {
if (Build.VERSION.SDK_INT >= 14 && SettingsManager.eventsPersistent()) {
// Ongoing icons are in the left side, so always use it.
persistentNotification.when = startTime;
if (messageNotifications.isEmpty()) {
......@@ -451,7 +452,7 @@ public class NotificationManager implements OnInitializedListener,
updateNotification(persistentNotification, ticker);
} else {
persistentNotification.icon = R.drawable.ic_placeholder;
persistentNotification.when = Application.SDK_INT >= 9 ? -Long.MAX_VALUE
persistentNotification.when = Build.VERSION.SDK_INT >= 9 ? -Long.MAX_VALUE
: Long.MAX_VALUE;
}
}
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment