kosyak
6e71e26044
# Conflicts: # build.gradle # gradle/wrapper/gradle-wrapper.properties # src/conversations/java/eu/siacs/conversations/ui/ImportBackupActivity.java # src/conversations/java/eu/siacs/conversations/ui/ManageAccountActivity.java # src/conversations/res/drawable-hdpi/ic_notification.png # src/conversations/res/drawable-mdpi/ic_notification.png # src/conversations/res/drawable-xhdpi/ic_notification.png # src/conversations/res/drawable-xxhdpi/ic_notification.png # src/conversations/res/drawable-xxxhdpi/ic_notification.png # src/main/java/eu/siacs/conversations/entities/Bookmark.java # src/main/java/eu/siacs/conversations/entities/Contact.java # src/main/java/eu/siacs/conversations/entities/Conversation.java # src/main/java/eu/siacs/conversations/parser/MessageParser.java # src/main/java/eu/siacs/conversations/parser/PresenceParser.java # src/main/java/eu/siacs/conversations/services/NotificationService.java # src/main/java/eu/siacs/conversations/services/XmppConnectionService.java # src/main/java/eu/siacs/conversations/ui/AboutActivity.java # src/main/java/eu/siacs/conversations/ui/ChannelDiscoveryActivity.java # src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java # src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java # src/main/java/eu/siacs/conversations/ui/ConversationFragment.java # src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java # src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java # src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java # src/main/java/eu/siacs/conversations/ui/MemorizingActivity.java # src/main/java/eu/siacs/conversations/ui/RecordingActivity.java # src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java # src/main/java/eu/siacs/conversations/ui/SettingsActivity.java # src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java # src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java # src/main/java/eu/siacs/conversations/ui/XmppActivity.java # src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java # src/main/java/eu/siacs/conversations/ui/adapter/MediaPreviewAdapter.java # src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java # src/main/java/eu/siacs/conversations/ui/text/FixedURLSpan.java # src/main/java/eu/siacs/conversations/ui/util/SendButtonTool.java # src/main/java/eu/siacs/conversations/utils/ThemeHelper.java # src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java # src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java # src/main/java/eu/siacs/conversations/xmpp/jingle/ToneManager.java # src/main/java/eu/siacs/conversations/xmpp/jingle/WebRTCWrapper.java # src/main/res/drawable-hdpi/date_bubble_grey.9.png # src/main/res/drawable-hdpi/date_bubble_white.9.png # src/main/res/drawable-hdpi/ic_flip_camera_android_black_24dp.png # src/main/res/drawable-hdpi/ic_no_results_background_black.png # src/main/res/drawable-hdpi/ic_no_results_background_white.png # src/main/res/drawable-hdpi/ic_notifications_none_white80.png # src/main/res/drawable-hdpi/ic_notifications_off_white80.png # src/main/res/drawable-hdpi/ic_notifications_paused_white80.png # src/main/res/drawable-hdpi/ic_notifications_white80.png # src/main/res/drawable-hdpi/ic_qr_code_scan_white_24dp.png # src/main/res/drawable-hdpi/ic_search_background_black.png # src/main/res/drawable-hdpi/ic_search_background_white.png # src/main/res/drawable-hdpi/ic_send_cancel_away.png # src/main/res/drawable-hdpi/ic_send_cancel_dnd.png # src/main/res/drawable-hdpi/ic_send_cancel_offline.png # src/main/res/drawable-hdpi/ic_send_cancel_offline_white.png # src/main/res/drawable-hdpi/ic_send_cancel_online.png # src/main/res/drawable-hdpi/ic_send_location_away.png # src/main/res/drawable-hdpi/ic_send_location_dnd.png # src/main/res/drawable-hdpi/ic_send_location_offline.png # src/main/res/drawable-hdpi/ic_send_location_offline_white.png # src/main/res/drawable-hdpi/ic_send_location_online.png # src/main/res/drawable-hdpi/ic_send_photo_away.png # src/main/res/drawable-hdpi/ic_send_photo_dnd.png # src/main/res/drawable-hdpi/ic_send_photo_offline.png # src/main/res/drawable-hdpi/ic_send_photo_offline_white.png # src/main/res/drawable-hdpi/ic_send_photo_online.png # src/main/res/drawable-hdpi/ic_send_picture_away.png # src/main/res/drawable-hdpi/ic_send_picture_dnd.png # src/main/res/drawable-hdpi/ic_send_picture_offline.png # src/main/res/drawable-hdpi/ic_send_picture_offline_white.png # src/main/res/drawable-hdpi/ic_send_picture_online.png # src/main/res/drawable-hdpi/ic_send_text_away.png # src/main/res/drawable-hdpi/ic_send_text_dnd.png # src/main/res/drawable-hdpi/ic_send_text_offline.png # src/main/res/drawable-hdpi/ic_send_text_offline_white.png # src/main/res/drawable-hdpi/ic_send_text_online.png # src/main/res/drawable-hdpi/ic_send_videocam_away.png # src/main/res/drawable-hdpi/ic_send_videocam_dnd.png # src/main/res/drawable-hdpi/ic_send_videocam_offline.png # src/main/res/drawable-hdpi/ic_send_videocam_offline_white.png # src/main/res/drawable-hdpi/ic_send_videocam_online.png # src/main/res/drawable-hdpi/ic_send_voice_away.png # src/main/res/drawable-hdpi/ic_send_voice_dnd.png # src/main/res/drawable-hdpi/ic_send_voice_offline.png # src/main/res/drawable-hdpi/ic_send_voice_offline_white.png # src/main/res/drawable-hdpi/ic_send_voice_online.png # src/main/res/drawable-hdpi/ic_verified_fingerprint.png # src/main/res/drawable-hdpi/message_bubble_received.9.png # src/main/res/drawable-hdpi/message_bubble_received_dark.9.png # src/main/res/drawable-hdpi/message_bubble_received_grey.9.png # src/main/res/drawable-hdpi/message_bubble_received_warning.9.png # src/main/res/drawable-hdpi/message_bubble_received_white.9.png # src/main/res/drawable-hdpi/message_bubble_sent.9.png # src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png # src/main/res/drawable-mdpi/date_bubble_grey.9.png # src/main/res/drawable-mdpi/date_bubble_white.9.png # src/main/res/drawable-mdpi/ic_flip_camera_android_black_24dp.png # src/main/res/drawable-mdpi/ic_no_results_background_black.png # src/main/res/drawable-mdpi/ic_no_results_background_white.png # src/main/res/drawable-mdpi/ic_notifications_none_white80.png # src/main/res/drawable-mdpi/ic_notifications_off_white80.png # src/main/res/drawable-mdpi/ic_notifications_paused_white80.png # src/main/res/drawable-mdpi/ic_notifications_white80.png # src/main/res/drawable-mdpi/ic_qr_code_scan_white_24dp.png # src/main/res/drawable-mdpi/ic_search_background_black.png # src/main/res/drawable-mdpi/ic_search_background_white.png # src/main/res/drawable-mdpi/ic_send_cancel_away.png # src/main/res/drawable-mdpi/ic_send_cancel_dnd.png # src/main/res/drawable-mdpi/ic_send_cancel_offline.png # src/main/res/drawable-mdpi/ic_send_cancel_offline_white.png # src/main/res/drawable-mdpi/ic_send_cancel_online.png # src/main/res/drawable-mdpi/ic_send_location_away.png # src/main/res/drawable-mdpi/ic_send_location_dnd.png # src/main/res/drawable-mdpi/ic_send_location_offline.png # src/main/res/drawable-mdpi/ic_send_location_offline_white.png # src/main/res/drawable-mdpi/ic_send_location_online.png # src/main/res/drawable-mdpi/ic_send_photo_away.png # src/main/res/drawable-mdpi/ic_send_photo_dnd.png # src/main/res/drawable-mdpi/ic_send_photo_offline.png # src/main/res/drawable-mdpi/ic_send_photo_offline_white.png # src/main/res/drawable-mdpi/ic_send_photo_online.png # src/main/res/drawable-mdpi/ic_send_picture_away.png # src/main/res/drawable-mdpi/ic_send_picture_dnd.png # src/main/res/drawable-mdpi/ic_send_picture_offline.png # src/main/res/drawable-mdpi/ic_send_picture_offline_white.png # src/main/res/drawable-mdpi/ic_send_picture_online.png # src/main/res/drawable-mdpi/ic_send_text_away.png # src/main/res/drawable-mdpi/ic_send_text_dnd.png # src/main/res/drawable-mdpi/ic_send_text_offline.png # src/main/res/drawable-mdpi/ic_send_text_offline_white.png # src/main/res/drawable-mdpi/ic_send_text_online.png # src/main/res/drawable-mdpi/ic_send_videocam_away.png # src/main/res/drawable-mdpi/ic_send_videocam_dnd.png # src/main/res/drawable-mdpi/ic_send_videocam_offline.png # src/main/res/drawable-mdpi/ic_send_videocam_offline_white.png # src/main/res/drawable-mdpi/ic_send_videocam_online.png # src/main/res/drawable-mdpi/ic_send_voice_away.png # src/main/res/drawable-mdpi/ic_send_voice_dnd.png # src/main/res/drawable-mdpi/ic_send_voice_offline.png # src/main/res/drawable-mdpi/ic_send_voice_offline_white.png # src/main/res/drawable-mdpi/ic_send_voice_online.png # src/main/res/drawable-mdpi/ic_verified_fingerprint.png # src/main/res/drawable-mdpi/message_bubble_received.9.png # src/main/res/drawable-mdpi/message_bubble_received_dark.9.png # src/main/res/drawable-mdpi/message_bubble_received_grey.9.png # src/main/res/drawable-mdpi/message_bubble_received_warning.9.png # src/main/res/drawable-mdpi/message_bubble_received_white.9.png # src/main/res/drawable-mdpi/message_bubble_sent.9.png # src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png # src/main/res/drawable-mdpi/play_gif_black.png # src/main/res/drawable-mdpi/play_gif_white.png # src/main/res/drawable-mdpi/play_video_black.png # src/main/res/drawable-mdpi/play_video_white.png # src/main/res/drawable-xhdpi/date_bubble_grey.9.png # src/main/res/drawable-xhdpi/date_bubble_white.9.png # src/main/res/drawable-xhdpi/ic_flip_camera_android_black_24dp.png # src/main/res/drawable-xhdpi/ic_no_results_background_black.png # src/main/res/drawable-xhdpi/ic_no_results_background_white.png # src/main/res/drawable-xhdpi/ic_notifications_none_white80.png # src/main/res/drawable-xhdpi/ic_notifications_off_white80.png # src/main/res/drawable-xhdpi/ic_notifications_paused_white80.png # src/main/res/drawable-xhdpi/ic_notifications_white80.png # src/main/res/drawable-xhdpi/ic_qr_code_scan_white_24dp.png # src/main/res/drawable-xhdpi/ic_search_background_black.png # src/main/res/drawable-xhdpi/ic_search_background_white.png # src/main/res/drawable-xhdpi/ic_send_cancel_away.png # src/main/res/drawable-xhdpi/ic_send_cancel_dnd.png # src/main/res/drawable-xhdpi/ic_send_cancel_offline.png # src/main/res/drawable-xhdpi/ic_send_cancel_offline_white.png # src/main/res/drawable-xhdpi/ic_send_cancel_online.png # src/main/res/drawable-xhdpi/ic_send_location_away.png # src/main/res/drawable-xhdpi/ic_send_location_dnd.png # src/main/res/drawable-xhdpi/ic_send_location_offline.png # src/main/res/drawable-xhdpi/ic_send_location_offline_white.png # src/main/res/drawable-xhdpi/ic_send_location_online.png # src/main/res/drawable-xhdpi/ic_send_photo_away.png # src/main/res/drawable-xhdpi/ic_send_photo_dnd.png # src/main/res/drawable-xhdpi/ic_send_photo_offline.png # src/main/res/drawable-xhdpi/ic_send_photo_offline_white.png # src/main/res/drawable-xhdpi/ic_send_photo_online.png # src/main/res/drawable-xhdpi/ic_send_picture_away.png # src/main/res/drawable-xhdpi/ic_send_picture_dnd.png # src/main/res/drawable-xhdpi/ic_send_picture_offline.png # src/main/res/drawable-xhdpi/ic_send_picture_offline_white.png # src/main/res/drawable-xhdpi/ic_send_picture_online.png # src/main/res/drawable-xhdpi/ic_send_text_away.png # src/main/res/drawable-xhdpi/ic_send_text_dnd.png # src/main/res/drawable-xhdpi/ic_send_text_offline.png # src/main/res/drawable-xhdpi/ic_send_text_offline_white.png # src/main/res/drawable-xhdpi/ic_send_text_online.png # src/main/res/drawable-xhdpi/ic_send_videocam_away.png # src/main/res/drawable-xhdpi/ic_send_videocam_dnd.png # src/main/res/drawable-xhdpi/ic_send_videocam_offline.png # src/main/res/drawable-xhdpi/ic_send_videocam_offline_white.png # src/main/res/drawable-xhdpi/ic_send_videocam_online.png # src/main/res/drawable-xhdpi/ic_send_voice_away.png # src/main/res/drawable-xhdpi/ic_send_voice_dnd.png # src/main/res/drawable-xhdpi/ic_send_voice_offline.png # src/main/res/drawable-xhdpi/ic_send_voice_offline_white.png # src/main/res/drawable-xhdpi/ic_send_voice_online.png # src/main/res/drawable-xhdpi/ic_verified_fingerprint.png # src/main/res/drawable-xhdpi/message_bubble_received.9.png # src/main/res/drawable-xhdpi/message_bubble_received_dark.9.png # src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png # src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png # src/main/res/drawable-xhdpi/message_bubble_received_white.9.png # src/main/res/drawable-xhdpi/message_bubble_sent.9.png # src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png # src/main/res/drawable-xxhdpi/date_bubble_grey.9.png # src/main/res/drawable-xxhdpi/date_bubble_white.9.png # src/main/res/drawable-xxhdpi/ic_flip_camera_android_black_24dp.png # src/main/res/drawable-xxhdpi/ic_no_results_background_black.png # src/main/res/drawable-xxhdpi/ic_no_results_background_white.png # src/main/res/drawable-xxhdpi/ic_notifications_none_white80.png # src/main/res/drawable-xxhdpi/ic_notifications_off_white80.png # src/main/res/drawable-xxhdpi/ic_notifications_paused_white80.png # src/main/res/drawable-xxhdpi/ic_notifications_white80.png # src/main/res/drawable-xxhdpi/ic_qr_code_scan_white_24dp.png # src/main/res/drawable-xxhdpi/ic_search_background_black.png # src/main/res/drawable-xxhdpi/ic_search_background_white.png # src/main/res/drawable-xxhdpi/ic_send_cancel_away.png # src/main/res/drawable-xxhdpi/ic_send_cancel_dnd.png # src/main/res/drawable-xxhdpi/ic_send_cancel_offline.png # src/main/res/drawable-xxhdpi/ic_send_cancel_offline_white.png # src/main/res/drawable-xxhdpi/ic_send_cancel_online.png # src/main/res/drawable-xxhdpi/ic_send_location_away.png # src/main/res/drawable-xxhdpi/ic_send_location_dnd.png # src/main/res/drawable-xxhdpi/ic_send_location_offline.png # src/main/res/drawable-xxhdpi/ic_send_location_offline_white.png # src/main/res/drawable-xxhdpi/ic_send_location_online.png # src/main/res/drawable-xxhdpi/ic_send_photo_away.png # src/main/res/drawable-xxhdpi/ic_send_photo_dnd.png # src/main/res/drawable-xxhdpi/ic_send_photo_offline.png # src/main/res/drawable-xxhdpi/ic_send_photo_offline_white.png # src/main/res/drawable-xxhdpi/ic_send_photo_online.png # src/main/res/drawable-xxhdpi/ic_send_picture_away.png # src/main/res/drawable-xxhdpi/ic_send_picture_dnd.png # src/main/res/drawable-xxhdpi/ic_send_picture_offline.png # src/main/res/drawable-xxhdpi/ic_send_picture_offline_white.png # src/main/res/drawable-xxhdpi/ic_send_picture_online.png # src/main/res/drawable-xxhdpi/ic_send_text_away.png # src/main/res/drawable-xxhdpi/ic_send_text_dnd.png # src/main/res/drawable-xxhdpi/ic_send_text_offline.png # src/main/res/drawable-xxhdpi/ic_send_text_offline_white.png # src/main/res/drawable-xxhdpi/ic_send_text_online.png # src/main/res/drawable-xxhdpi/ic_send_videocam_away.png # src/main/res/drawable-xxhdpi/ic_send_videocam_dnd.png # src/main/res/drawable-xxhdpi/ic_send_videocam_offline.png # src/main/res/drawable-xxhdpi/ic_send_videocam_offline_white.png # src/main/res/drawable-xxhdpi/ic_send_videocam_online.png # src/main/res/drawable-xxhdpi/ic_send_voice_away.png # src/main/res/drawable-xxhdpi/ic_send_voice_dnd.png # src/main/res/drawable-xxhdpi/ic_send_voice_offline.png # src/main/res/drawable-xxhdpi/ic_send_voice_offline_white.png # src/main/res/drawable-xxhdpi/ic_send_voice_online.png # src/main/res/drawable-xxhdpi/ic_verified_fingerprint.png # src/main/res/drawable-xxhdpi/message_bubble_received.9.png # src/main/res/drawable-xxhdpi/message_bubble_received_dark.9.png # src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png # src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png # src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png # src/main/res/drawable-xxhdpi/message_bubble_sent.9.png # src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png # src/main/res/drawable-xxxhdpi/date_bubble_grey.9.png # src/main/res/drawable-xxxhdpi/date_bubble_white.9.png # src/main/res/drawable-xxxhdpi/ic_flip_camera_android_black_24dp.png # src/main/res/drawable-xxxhdpi/ic_no_results_background_black.png # src/main/res/drawable-xxxhdpi/ic_no_results_background_white.png # src/main/res/drawable-xxxhdpi/ic_notifications_none_white80.png # src/main/res/drawable-xxxhdpi/ic_notifications_off_white80.png # src/main/res/drawable-xxxhdpi/ic_notifications_paused_white80.png # src/main/res/drawable-xxxhdpi/ic_notifications_white80.png # src/main/res/drawable-xxxhdpi/ic_qr_code_scan_white_24dp.png # src/main/res/drawable-xxxhdpi/ic_search_background_black.png # src/main/res/drawable-xxxhdpi/ic_search_background_white.png # src/main/res/drawable-xxxhdpi/ic_send_cancel_away.png # src/main/res/drawable-xxxhdpi/ic_send_cancel_dnd.png # src/main/res/drawable-xxxhdpi/ic_send_cancel_offline.png # src/main/res/drawable-xxxhdpi/ic_send_cancel_offline_white.png # src/main/res/drawable-xxxhdpi/ic_send_cancel_online.png # src/main/res/drawable-xxxhdpi/ic_send_location_away.png # src/main/res/drawable-xxxhdpi/ic_send_location_dnd.png # src/main/res/drawable-xxxhdpi/ic_send_location_offline.png # src/main/res/drawable-xxxhdpi/ic_send_location_offline_white.png # src/main/res/drawable-xxxhdpi/ic_send_location_online.png # src/main/res/drawable-xxxhdpi/ic_send_photo_away.png # src/main/res/drawable-xxxhdpi/ic_send_photo_dnd.png # src/main/res/drawable-xxxhdpi/ic_send_photo_offline.png # src/main/res/drawable-xxxhdpi/ic_send_photo_offline_white.png # src/main/res/drawable-xxxhdpi/ic_send_photo_online.png # src/main/res/drawable-xxxhdpi/ic_send_picture_away.png # src/main/res/drawable-xxxhdpi/ic_send_picture_dnd.png # src/main/res/drawable-xxxhdpi/ic_send_picture_offline.png # src/main/res/drawable-xxxhdpi/ic_send_picture_offline_white.png # src/main/res/drawable-xxxhdpi/ic_send_picture_online.png # src/main/res/drawable-xxxhdpi/ic_send_text_away.png # src/main/res/drawable-xxxhdpi/ic_send_text_dnd.png # src/main/res/drawable-xxxhdpi/ic_send_text_offline.png # src/main/res/drawable-xxxhdpi/ic_send_text_offline_white.png # src/main/res/drawable-xxxhdpi/ic_send_text_online.png # src/main/res/drawable-xxxhdpi/ic_send_videocam_away.png # src/main/res/drawable-xxxhdpi/ic_send_videocam_dnd.png # src/main/res/drawable-xxxhdpi/ic_send_videocam_offline.png # src/main/res/drawable-xxxhdpi/ic_send_videocam_offline_white.png # src/main/res/drawable-xxxhdpi/ic_send_videocam_online.png # src/main/res/drawable-xxxhdpi/ic_send_voice_away.png # src/main/res/drawable-xxxhdpi/ic_send_voice_dnd.png # src/main/res/drawable-xxxhdpi/ic_send_voice_offline.png # src/main/res/drawable-xxxhdpi/ic_send_voice_offline_white.png # src/main/res/drawable-xxxhdpi/ic_send_voice_online.png # src/main/res/drawable-xxxhdpi/ic_verified_fingerprint.png # src/main/res/drawable-xxxhdpi/message_bubble_received.9.png # src/main/res/drawable-xxxhdpi/message_bubble_received_dark.9.png # src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png # src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png # src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png # src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png # src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png # src/main/res/drawable/ic_done_24dp.xml # src/main/res/layout/activity_muc_details.xml # src/main/res/layout/activity_rtp_session.xml # src/main/res/layout/enter_jid_dialog.xml # src/main/res/layout/fragment_conversation.xml # src/main/res/layout/message_date_bubble.xml # src/main/res/layout/message_received.xml # src/main/res/layout/message_rtp_session.xml # src/main/res/layout/message_sent.xml # src/main/res/layout/message_status.xml # src/main/res/layout/simple_list_item.xml # src/main/res/values/attrs.xml # src/main/res/values/colors.xml # src/main/res/values/defaults.xml # src/main/res/values/strings.xml # src/main/res/values/styles.xml # src/main/res/values/themes.xml # src/main/res/xml/preferences.xml # src/quicksy/java/eu/siacs/conversations/ui/ChooseCountryActivity.java # src/quicksy/res/drawable-hdpi/ic_notification.png # src/quicksy/res/drawable-mdpi/ic_notification.png # src/quicksy/res/drawable-xhdpi/ic_notification.png # src/quicksy/res/drawable-xxhdpi/ic_notification.png # src/quicksy/res/drawable-xxxhdpi/ic_notification.png |
||
|---|---|---|
| .. | ||
| fastlane/metadata/android | ||
| java/eu/siacs/conversations | ||
| res | ||
| AndroidManifest.xml | ||