kosyak
|
3db7413bf2
|
Revert "Merge branch 'master' of https://codeberg.org/iNPUTmice/Conversations"
This reverts commit 6e71e26044 , reversing
changes made to 82b4208304 .
|
2024-05-18 11:06:10 +02:00 |
|
kosyak
|
6e71e26044
|
Merge branch 'master' of https://codeberg.org/iNPUTmice/Conversations
# 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
|
2024-05-09 23:48:21 +02:00 |
|
Daniel Gultsch
|
45b9c4dcc9
|
refactor ExportBackupService to worker
|
2024-05-02 19:12:39 +02:00 |
|
Daniel Gultsch
|
23e88e6e42
|
version bump to 2.15.3 + changelog
|
2024-04-22 14:07:28 +02:00 |
|
Daniel Gultsch
|
67c900b344
|
version bump to 2.15.2
|
2024-04-19 14:00:05 +02:00 |
|
Daniel Gultsch
|
1ba46529ad
|
version bump to 2.15.1
|
2024-04-16 10:16:52 +02:00 |
|
Daniel Gultsch
|
a3cc91dc11
|
replace FlowLayout with constraint layout
|
2024-04-15 10:14:14 +02:00 |
|
Daniel Gultsch
|
6c564d8483
|
version bump to 2.15.0
|
2024-04-12 09:36:31 +02:00 |
|
Daniel Gultsch
|
2c28a0d1e6
|
version bump to 2.15.0-beta + changelog
|
2024-04-09 17:39:26 +02:00 |
|
Daniel Gultsch
|
85771fc26c
|
redesign settings screen (WIP)
|
2024-04-07 20:05:43 +02:00 |
|
Daniel Gultsch
|
6e43248135
|
apply Material 3 theme to all activites
|
2024-04-04 11:38:27 +02:00 |
|
Daniel Gultsch
|
4968bde774
|
version bump to 2.14.2 + changelog
|
2024-04-04 11:07:53 +02:00 |
|
Daniel Gultsch
|
c294a24f4e
|
add some call integration debug aids
|
2024-04-04 09:57:01 +02:00 |
|
Daniel Gultsch
|
429b190b8e
|
version bump to 2.14.1 + changelog
|
2024-03-30 15:00:32 +01:00 |
|
Daniel Gultsch
|
38e9533be4
|
bump gradle and AGP
|
2024-03-26 10:27:46 +01:00 |
|
Daniel Gultsch
|
e7edc2ce82
|
unnecessary version code bump to trigger new Google review
|
2024-03-22 11:56:21 +01:00 |
|
Daniel Gultsch
|
6b00e0b462
|
version bump to 2.14.0
|
2024-03-20 08:37:32 +01:00 |
|
Daniel Gultsch
|
8f35242c35
|
version bump to 2.14.0-beta.3
|
2024-03-12 19:17:55 +01:00 |
|
Daniel Gultsch
|
13839401e5
|
Merge branch '2.13.x'
|
2024-03-12 19:15:34 +01:00 |
|
Daniel Gultsch
|
2fa541f2dc
|
version bump to 2.13.5
|
2024-03-12 19:05:47 +01:00 |
|
Daniel Gultsch
|
55fd7157c8
|
version bump to 2.14.0-beta.2
|
2024-03-07 11:39:16 +01:00 |
|
Daniel Gultsch
|
94f3b1fb57
|
version bump to 2.14.0-beta + changelog
|
2024-02-23 09:54:13 +01:00 |
|
Daniel Gultsch
|
3ae561d74a
|
bump dependencies
|
2024-02-23 09:54:13 +01:00 |
|
Daniel Gultsch
|
19c634f3d2
|
use call integration via MANAGE_OWN_CALLS
better integrate calls into the system via 'Build a calling app'¹
a few hooks like onAnswer/onReject and automatic PhoneAccount creation are still missing
¹: https://developer.android.com/develop/connectivity/telecom/selfManaged
|
2024-02-23 09:54:08 +01:00 |
|
Daniel Gultsch
|
5183a51625
|
version bump to 2.13.4
|
2024-02-20 10:27:35 +01:00 |
|
kosyak
|
16a834e0eb
|
fix commands related bugs
|
2024-02-19 03:58:26 +01:00 |
|
kosyak
|
d5a089fb24
|
leakCanary only in debug
|
2024-02-19 00:49:30 +01:00 |
|
kosyak
|
3db7c2c3da
|
add leakCanary
|
2024-02-19 00:46:11 +01:00 |
|
Daniel Gultsch
|
956107511c
|
version bump to 2.13.3 + changelog
|
2024-02-15 08:39:00 +01:00 |
|
Daniel Gultsch
|
8598462737
|
remove address book integration from Conversations on PlayStore
|
2024-02-14 13:53:46 +01:00 |
|
Daniel Gultsch
|
59c23f5558
|
add ability to display privacy policy link in menu
|
2024-02-14 09:11:49 +01:00 |
|
Daniel Gultsch
|
5cad2dccb2
|
version bump to 2.13.2 (and rename changelogs)
|
2024-02-11 16:40:17 +01:00 |
|
Daniel Gultsch
|
a63b419e58
|
version bump to 2.13.1 (and rename changelogs)
|
2024-02-07 07:33:26 +01:00 |
|
Daniel Gultsch
|
a6ba658494
|
version bump to 2.13.1-beta.3
|
2024-01-21 18:10:30 +01:00 |
|
Daniel Gultsch
|
dd0c82302b
|
version bump to 2.13.1-beta.2 and changelog
|
2024-01-15 15:36:00 +01:00 |
|
Daniel Gultsch
|
3cf59b4181
|
bump various dependencies
|
2024-01-12 16:51:46 +01:00 |
|
kosyak
|
6a1499654a
|
fix crash during state saving
|
2024-01-01 11:52:00 +01:00 |
|
kosyak
|
db27258c18
|
fix crop lib compatibility issues
|
2023-12-18 04:24:49 +01:00 |
|
kosyak
|
b9f5286898
|
Merge branch 'master' of https://codeberg.org/iNPUTmice/Conversations
# Conflicts:
# build.gradle
# src/main/AndroidManifest.xml
# src/main/java/eu/siacs/conversations/Config.java
# src/main/java/eu/siacs/conversations/entities/Bookmark.java
# src/main/java/eu/siacs/conversations/parser/MessageParser.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/RtpSessionActivity.java
# src/main/java/eu/siacs/conversations/ui/XmppActivity.java
# src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
# src/main/java/eu/siacs/conversations/xmpp/jingle/ToneManager.java
# src/main/java/eu/siacs/conversations/xmpp/pep/PublishOptions.java
# src/main/res/values/strings.xml
|
2023-12-17 22:14:36 +01:00 |
|
Daniel Gultsch
|
a11d6638b0
|
bump gradle plugin version
|
2023-12-01 17:15:26 +01:00 |
|
Daniel Gultsch
|
35c03c34b7
|
version bump to 2.13.0 + changelog
|
2023-11-15 09:19:46 +01:00 |
|
Daniel Gultsch
|
a776aca1fa
|
do not set maxSdk on storage permissions
this might have bad interactions with legacy storage
|
2023-11-02 11:15:20 +01:00 |
|
Daniel Gultsch
|
14a6652618
|
version bump to 2.13.0-beta
this is just a beta release to test the Google Play policies wrt Android 14
|
2023-11-02 10:02:02 +01:00 |
|
Daniel Gultsch
|
695bdc329f
|
specifically only build known abis
|
2023-11-01 12:22:35 +01:00 |
|
Daniel Gultsch
|
e76dfb96bf
|
bump some more dependencies
|
2023-11-01 10:19:59 +01:00 |
|
Daniel Gultsch
|
c857ba7cb2
|
bump libwebrtc to m119
|
2023-11-01 09:59:04 +01:00 |
|
Daniel Gultsch
|
30d681bcb8
|
enable Java 17 language features
|
2023-10-29 08:54:18 +01:00 |
|
Daniel Gultsch
|
cec8a7ec55
|
bump various dependencies
|
2023-10-29 08:54:18 +01:00 |
|
Daniel Gultsch
|
9cd88f00cf
|
fix some linter warnings
|
2023-10-29 08:54:18 +01:00 |
|
Daniel Gultsch
|
35c8d31d42
|
update gradle and gradle plugin
|
2023-10-29 08:54:17 +01:00 |
|