From a7a00b70d70649b5ca9d5ce1377cb8fbd15e690e Mon Sep 17 00:00:00 2001 From: kosyak Date: Tue, 28 May 2024 15:38:55 +0200 Subject: [PATCH] clean code and optimize imports --- art/conversations_mono.svg | 24 +-- art/conversations_mono_dashed.svg | 24 +-- art/date_bubble_grey.svg | 18 +- art/date_bubble_white.svg | 18 +- art/ic_launcher.svg | 22 +-- art/ic_no_results_black.svg | 19 +- art/ic_no_results_white.svg | 19 +- art/ic_notifications_none_white80.svg | 19 +- art/ic_notifications_off_white80.svg | 19 +- art/ic_notifications_paused_white80.svg | 19 +- art/ic_notifications_white80.svg | 19 +- art/ic_search_black.svg | 19 +- art/ic_search_white.svg | 19 +- art/ic_send_cancel_away.svg | 19 +- art/ic_send_cancel_dnd.svg | 19 +- art/ic_send_cancel_offline.svg | 19 +- art/ic_send_cancel_offline_white.svg | 19 +- art/ic_send_cancel_online.svg | 19 +- art/ic_send_location_away.svg | 19 +- art/ic_send_location_dnd.svg | 19 +- art/ic_send_location_offline.svg | 19 +- art/ic_send_location_offline_white.svg | 19 +- art/ic_send_location_online.svg | 19 +- art/ic_send_photo_away.svg | 19 +- art/ic_send_photo_dnd.svg | 19 +- art/ic_send_photo_offline.svg | 19 +- art/ic_send_photo_offline_white.svg | 19 +- art/ic_send_photo_online.svg | 19 +- art/ic_send_picture_away.svg | 19 +- art/ic_send_picture_dnd.svg | 19 +- art/ic_send_picture_offline.svg | 19 +- art/ic_send_picture_offline_white.svg | 19 +- art/ic_send_picture_online.svg | 19 +- art/ic_send_text_away.svg | 23 +-- art/ic_send_text_dnd.svg | 23 +-- art/ic_send_text_offline.svg | 23 +-- art/ic_send_text_offline_white.svg | 23 +-- art/ic_send_text_online.svg | 23 +-- art/ic_send_videocam_away.svg | 19 +- art/ic_send_videocam_dnd.svg | 19 +- art/ic_send_videocam_offline.svg | 19 +- art/ic_send_videocam_offline_white.svg | 19 +- art/ic_send_videocam_online.svg | 19 +- art/ic_send_voice_away.svg | 19 +- art/ic_send_voice_dnd.svg | 19 +- art/ic_send_voice_offline.svg | 19 +- art/ic_send_voice_offline_white.svg | 19 +- art/ic_send_voice_online.svg | 19 +- art/ic_verified_fingerprint.svg | 19 +- art/marker.svg | 20 +-- art/message_bubble_received.svg | 18 +- art/message_bubble_received_dark.svg | 18 +- art/message_bubble_received_dark_non_last.svg | 18 +- art/message_bubble_received_grey.svg | 18 +- art/message_bubble_received_grey_non_last.svg | 18 +- art/message_bubble_received_non_last.svg | 16 +- art/message_bubble_received_warning.svg | 18 +- ...ssage_bubble_received_warning_non_last.svg | 18 +- art/message_bubble_received_white.svg | 18 +- ...message_bubble_received_white_non_last.svg | 18 +- art/message_bubble_sent.svg | 18 +- art/message_bubble_sent_grey.svg | 18 +- art/message_bubble_sent_grey_non_last.svg | 18 +- art/message_bubble_sent_non_last.svg | 18 +- art/omemo_logo.svg | 22 +-- art/open_pdf_black.svg | 19 +- art/open_pdf_white.svg | 19 +- art/play_gif_black.svg | 20 +-- art/play_gif_white.svg | 20 +-- art/play_video_black.svg | 19 +- art/play_video_white.svg | 19 +- art/qrcode-scan.svg | 22 +-- art/quicksy.svg | 24 +-- art/quicksy_mono.svg | 24 +-- art/render.rb | 164 ------------------ conversationsFree/.DS_Store | Bin 0 -> 6148 bytes .../services/PushManagementService.java | 1 - .../de/gultsch/minidns/AndroidDNSClient.java | 13 +- .../java/de/gultsch/minidns/DNSSocket.java | 7 +- .../de/gultsch/minidns/NetworkDataSource.java | 13 +- .../http/HttpDownloadConnection.java | 4 +- .../siacs/conversations/ui/AboutActivity.java | 4 +- .../conversations/ui/AboutPreference.java | 1 - .../AbstractSearchableListItemActivity.java | 1 - .../ui/ConferenceDetailsActivity.java | 6 +- .../ui/ContactDetailsActivity.java | 6 +- .../ui/ConversationsActivity.java | 1 - .../ui/ConversationsOverviewFragment.java | 8 +- .../ui/CreatePublicChannelDialog.java | 1 - .../conversations/ui/EnterJidDialog.java | 10 +- .../conversations/ui/LocationActivity.java | 2 +- .../conversations/ui/MucUsersActivity.java | 2 - ...ublishGroupChatProfilePictureActivity.java | 8 +- .../conversations/ui/RtpSessionActivity.java | 14 +- .../conversations/ui/SearchActivity.java | 7 +- .../conversations/ui/SendLogActivity.java | 5 - .../ui/StartConversationActivity.java | 9 - .../conversations/ui/UriHandlerActivity.java | 15 +- .../siacs/conversations/ui/XmppActivity.java | 6 - .../ui/adapter/ConversationAdapter.java | 4 - .../ui/adapter/MediaPreviewAdapter.java | 2 +- .../conversations/ui/util/Attachment.java | 1 - .../conversations/ui/util/MyLinkify.java | 1 - .../siacs/conversations/ui/util/ViewUtil.java | 3 - .../xmpp/jingle/ToneManager.java | 8 +- .../jingle/stanzas/IceUdpTransportInfo.java | 10 +- .../xmpp/jingle/stanzas/Reason.java | 1 - .../res/drawable/ic_launcher_foreground.xml | 9 +- .../res/layout/activity_contact_details.xml | 3 +- src/main/res/layout/activity_share_with.xml | 1 - src/main/res/layout/activity_trust_keys.xml | 3 +- src/main/res/layout/button_grid_item.xml | 3 +- .../res/layout/command_button_grid_field.xml | 3 +- .../res/layout/command_checkbox_field.xml | 3 +- src/main/res/layout/command_item_card.xml | 3 +- src/main/res/layout/command_note.xml | 3 +- src/main/res/layout/command_progress_bar.xml | 3 +- .../res/layout/command_radio_edit_field.xml | 3 +- src/main/res/layout/command_result_cell.xml | 3 +- src/main/res/layout/command_result_field.xml | 3 +- src/main/res/layout/command_row.xml | 3 +- .../res/layout/command_search_list_field.xml | 3 +- src/main/res/layout/command_spinner_field.xml | 3 +- src/main/res/layout/command_unknown.xml | 3 +- src/main/res/layout/command_webview.xml | 3 +- src/main/res/layout/radio_grid_item.xml | 3 +- 126 files changed, 394 insertions(+), 1445 deletions(-) delete mode 100755 art/render.rb create mode 100644 conversationsFree/.DS_Store diff --git a/art/conversations_mono.svg b/art/conversations_mono.svg index 8bd294736..93ba8a1ba 100644 --- a/art/conversations_mono.svg +++ b/art/conversations_mono.svg @@ -1,24 +1,12 @@ - + - + - + - + - + - + diff --git a/art/ic_no_results_white.svg b/art/ic_no_results_white.svg index 744616a48..aacd764e8 100644 --- a/art/ic_no_results_white.svg +++ b/art/ic_no_results_white.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_notifications_none_white80.svg b/art/ic_notifications_none_white80.svg index d333130ff..b172c7916 100644 --- a/art/ic_notifications_none_white80.svg +++ b/art/ic_notifications_none_white80.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_notifications_off_white80.svg b/art/ic_notifications_off_white80.svg index f0af47b61..dcba76513 100644 --- a/art/ic_notifications_off_white80.svg +++ b/art/ic_notifications_off_white80.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_notifications_paused_white80.svg b/art/ic_notifications_paused_white80.svg index 4f92e8475..d0bf102d8 100644 --- a/art/ic_notifications_paused_white80.svg +++ b/art/ic_notifications_paused_white80.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_notifications_white80.svg b/art/ic_notifications_white80.svg index 398e51385..6e960f3f7 100644 --- a/art/ic_notifications_white80.svg +++ b/art/ic_notifications_white80.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_search_black.svg b/art/ic_search_black.svg index e3d0e8096..210fbe8a7 100644 --- a/art/ic_search_black.svg +++ b/art/ic_search_black.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_search_white.svg b/art/ic_search_white.svg index 7186d8e23..92b82731f 100644 --- a/art/ic_search_white.svg +++ b/art/ic_search_white.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_cancel_away.svg b/art/ic_send_cancel_away.svg index 1ee9c40f6..76c30da15 100644 --- a/art/ic_send_cancel_away.svg +++ b/art/ic_send_cancel_away.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_cancel_dnd.svg b/art/ic_send_cancel_dnd.svg index 67a562b2f..0db9b04e7 100644 --- a/art/ic_send_cancel_dnd.svg +++ b/art/ic_send_cancel_dnd.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_cancel_offline.svg b/art/ic_send_cancel_offline.svg index b88ade09d..73a3575a5 100644 --- a/art/ic_send_cancel_offline.svg +++ b/art/ic_send_cancel_offline.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_cancel_offline_white.svg b/art/ic_send_cancel_offline_white.svg index f84f62f57..c757629dd 100644 --- a/art/ic_send_cancel_offline_white.svg +++ b/art/ic_send_cancel_offline_white.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_cancel_online.svg b/art/ic_send_cancel_online.svg index 133e69f11..31e0c9d22 100644 --- a/art/ic_send_cancel_online.svg +++ b/art/ic_send_cancel_online.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_location_away.svg b/art/ic_send_location_away.svg index fcd50b521..410597c34 100644 --- a/art/ic_send_location_away.svg +++ b/art/ic_send_location_away.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_location_dnd.svg b/art/ic_send_location_dnd.svg index 705cdb6f4..97d15d8a5 100644 --- a/art/ic_send_location_dnd.svg +++ b/art/ic_send_location_dnd.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_location_offline.svg b/art/ic_send_location_offline.svg index 56529b723..219ec427f 100644 --- a/art/ic_send_location_offline.svg +++ b/art/ic_send_location_offline.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_location_offline_white.svg b/art/ic_send_location_offline_white.svg index f7f60a8f4..6712e5c2c 100644 --- a/art/ic_send_location_offline_white.svg +++ b/art/ic_send_location_offline_white.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_location_online.svg b/art/ic_send_location_online.svg index 76d146ccf..1fe6c1234 100644 --- a/art/ic_send_location_online.svg +++ b/art/ic_send_location_online.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_photo_away.svg b/art/ic_send_photo_away.svg index 31a20e09f..f2f5e8f22 100644 --- a/art/ic_send_photo_away.svg +++ b/art/ic_send_photo_away.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_photo_dnd.svg b/art/ic_send_photo_dnd.svg index 9ef8b7821..5c26150d9 100644 --- a/art/ic_send_photo_dnd.svg +++ b/art/ic_send_photo_dnd.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_photo_offline.svg b/art/ic_send_photo_offline.svg index b2ca20a6f..e652d34a9 100644 --- a/art/ic_send_photo_offline.svg +++ b/art/ic_send_photo_offline.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_photo_offline_white.svg b/art/ic_send_photo_offline_white.svg index 45875731c..efbae3e78 100644 --- a/art/ic_send_photo_offline_white.svg +++ b/art/ic_send_photo_offline_white.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_photo_online.svg b/art/ic_send_photo_online.svg index f29c3c7c7..938c79ee5 100644 --- a/art/ic_send_photo_online.svg +++ b/art/ic_send_photo_online.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_picture_away.svg b/art/ic_send_picture_away.svg index a85a1eecb..ba6dcc716 100644 --- a/art/ic_send_picture_away.svg +++ b/art/ic_send_picture_away.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_picture_dnd.svg b/art/ic_send_picture_dnd.svg index 0c7d06356..1f13a1bba 100644 --- a/art/ic_send_picture_dnd.svg +++ b/art/ic_send_picture_dnd.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_picture_offline.svg b/art/ic_send_picture_offline.svg index 048508a35..0d4221b1d 100644 --- a/art/ic_send_picture_offline.svg +++ b/art/ic_send_picture_offline.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_picture_offline_white.svg b/art/ic_send_picture_offline_white.svg index 16131740f..b022098b6 100644 --- a/art/ic_send_picture_offline_white.svg +++ b/art/ic_send_picture_offline_white.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_picture_online.svg b/art/ic_send_picture_online.svg index ff388a4d4..53583883c 100644 --- a/art/ic_send_picture_online.svg +++ b/art/ic_send_picture_online.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_text_away.svg b/art/ic_send_text_away.svg index ea83086ae..c4efbe568 100644 --- a/art/ic_send_text_away.svg +++ b/art/ic_send_text_away.svg @@ -1,23 +1,12 @@ - + diff --git a/art/ic_send_text_dnd.svg b/art/ic_send_text_dnd.svg index 1b7ad51f4..c6f67133a 100644 --- a/art/ic_send_text_dnd.svg +++ b/art/ic_send_text_dnd.svg @@ -1,23 +1,12 @@ - + diff --git a/art/ic_send_text_offline.svg b/art/ic_send_text_offline.svg index c87bfaac6..6d3faa93e 100644 --- a/art/ic_send_text_offline.svg +++ b/art/ic_send_text_offline.svg @@ -1,23 +1,12 @@ - + diff --git a/art/ic_send_text_offline_white.svg b/art/ic_send_text_offline_white.svg index 4434d33db..1d304ef1b 100644 --- a/art/ic_send_text_offline_white.svg +++ b/art/ic_send_text_offline_white.svg @@ -1,23 +1,12 @@ - + diff --git a/art/ic_send_text_online.svg b/art/ic_send_text_online.svg index ff01bd6ef..020815a30 100644 --- a/art/ic_send_text_online.svg +++ b/art/ic_send_text_online.svg @@ -1,23 +1,12 @@ - + diff --git a/art/ic_send_videocam_away.svg b/art/ic_send_videocam_away.svg index 52b8478cf..e38dc91c7 100644 --- a/art/ic_send_videocam_away.svg +++ b/art/ic_send_videocam_away.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_videocam_dnd.svg b/art/ic_send_videocam_dnd.svg index 254e3859a..9fba5ac5a 100644 --- a/art/ic_send_videocam_dnd.svg +++ b/art/ic_send_videocam_dnd.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_videocam_offline.svg b/art/ic_send_videocam_offline.svg index 91a7778d6..fd1799209 100644 --- a/art/ic_send_videocam_offline.svg +++ b/art/ic_send_videocam_offline.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_videocam_offline_white.svg b/art/ic_send_videocam_offline_white.svg index 67f5563a6..e6467c757 100644 --- a/art/ic_send_videocam_offline_white.svg +++ b/art/ic_send_videocam_offline_white.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_videocam_online.svg b/art/ic_send_videocam_online.svg index 7ee2fff97..fac2fadb7 100644 --- a/art/ic_send_videocam_online.svg +++ b/art/ic_send_videocam_online.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_voice_away.svg b/art/ic_send_voice_away.svg index 379f55b7d..78534750c 100644 --- a/art/ic_send_voice_away.svg +++ b/art/ic_send_voice_away.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_voice_dnd.svg b/art/ic_send_voice_dnd.svg index b1b7a7a97..4ef81de7f 100644 --- a/art/ic_send_voice_dnd.svg +++ b/art/ic_send_voice_dnd.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_voice_offline.svg b/art/ic_send_voice_offline.svg index 64ea44731..fbbf589f9 100644 --- a/art/ic_send_voice_offline.svg +++ b/art/ic_send_voice_offline.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_voice_offline_white.svg b/art/ic_send_voice_offline_white.svg index 25ffe3223..970927c66 100644 --- a/art/ic_send_voice_offline_white.svg +++ b/art/ic_send_voice_offline_white.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_send_voice_online.svg b/art/ic_send_voice_online.svg index 2c5405236..5a75cb9a8 100644 --- a/art/ic_send_voice_online.svg +++ b/art/ic_send_voice_online.svg @@ -1,19 +1,8 @@ - + diff --git a/art/ic_verified_fingerprint.svg b/art/ic_verified_fingerprint.svg index 689c42ebd..f8b9329d9 100644 --- a/art/ic_verified_fingerprint.svg +++ b/art/ic_verified_fingerprint.svg @@ -1,19 +1,8 @@ - + diff --git a/art/marker.svg b/art/marker.svg index 35e7f5774..28fdbb8e8 100644 --- a/art/marker.svg +++ b/art/marker.svg @@ -1,20 +1,8 @@ - + diff --git a/art/message_bubble_received.svg b/art/message_bubble_received.svg index 0ec91b5f7..e206a842f 100644 --- a/art/message_bubble_received.svg +++ b/art/message_bubble_received.svg @@ -1,20 +1,10 @@ - + - + - + - + - + - diff --git a/art/message_bubble_received_warning.svg b/art/message_bubble_received_warning.svg index 96a6994b0..7ffdd2b38 100644 --- a/art/message_bubble_received_warning.svg +++ b/art/message_bubble_received_warning.svg @@ -1,20 +1,10 @@ - + - + - + - + - + - + - + - + - + diff --git a/art/open_pdf_black.svg b/art/open_pdf_black.svg index 0fa22285a..256424e1b 100644 --- a/art/open_pdf_black.svg +++ b/art/open_pdf_black.svg @@ -1,19 +1,8 @@ - + diff --git a/art/open_pdf_white.svg b/art/open_pdf_white.svg index a307529bb..a1ec2ec5c 100644 --- a/art/open_pdf_white.svg +++ b/art/open_pdf_white.svg @@ -1,19 +1,8 @@ - + diff --git a/art/play_gif_black.svg b/art/play_gif_black.svg index a2b426a24..d7734a8f8 100644 --- a/art/play_gif_black.svg +++ b/art/play_gif_black.svg @@ -1,20 +1,8 @@ - + diff --git a/art/play_gif_white.svg b/art/play_gif_white.svg index f8ec27426..22bf1eab9 100644 --- a/art/play_gif_white.svg +++ b/art/play_gif_white.svg @@ -1,20 +1,8 @@ - + diff --git a/art/play_video_black.svg b/art/play_video_black.svg index 72d6e756f..404acb030 100644 --- a/art/play_video_black.svg +++ b/art/play_video_black.svg @@ -1,19 +1,8 @@ - + diff --git a/art/play_video_white.svg b/art/play_video_white.svg index c8a1558ba..0bfb46597 100644 --- a/art/play_video_white.svg +++ b/art/play_video_white.svg @@ -1,19 +1,8 @@ - + diff --git a/art/qrcode-scan.svg b/art/qrcode-scan.svg index 63f1f6a15..173157e0c 100644 --- a/art/qrcode-scan.svg +++ b/art/qrcode-scan.svg @@ -1,21 +1,9 @@ -image/svg+xml - + - + 1, - 'hdpi' => 1.5, - 'xhdpi' => 2, - 'xxhdpi' => 3, - 'xxxhdpi' => 4 -} - -images = { - 'main_logo.svg' => ['conversations/main_logo', 200], - 'quicksy_main_logo.svg' => ['quicksy/main_logo', 200], - 'splash_logo.svg' => ['conversations/splash_logo', 144], - 'quicksy_splash_logo.svg' => ['quicksy/splash_logo', 144], - 'ic_search_black.svg' => ['ic_search_background_black', 144], - 'ic_search_white.svg' => ['ic_search_background_white', 144], - 'ic_no_results_white.svg' => ['ic_no_results_background_white', 144], - 'ic_no_results_black.svg' => ['ic_no_results_background_black', 144], - 'play_video_white.svg' => ['play_video_white', 128], - 'play_gif_white.svg' => ['play_gif_white', 128], - 'play_video_black.svg' => ['play_video_black', 128], - 'play_gif_black.svg' => ['play_gif_black', 128], - 'open_pdf_black.svg' => ['open_pdf_black', 128], - 'open_pdf_white.svg' => ['open_pdf_white', 128], - 'conversations_mono.svg' => ['conversations/ic_notification', 24], - 'quicksy_mono.svg' => ['quicksy/ic_notification', 24], - 'flip_camera_android-black-24dp.svg' => ['ic_flip_camera_android_black_24dp', 24], - 'ic_send_text_offline.svg' => ['ic_send_text_offline', 36], - 'ic_send_text_offline_white.svg' => ['ic_send_text_offline_white', 36], - 'ic_send_text_online.svg' => ['ic_send_text_online', 36], - 'ic_send_text_away.svg' => ['ic_send_text_away', 36], - 'ic_send_text_dnd.svg' => ['ic_send_text_dnd', 36], - 'ic_send_photo_online.svg' => ['ic_send_photo_online', 36], - 'ic_send_photo_offline.svg' => ['ic_send_photo_offline', 36], - 'ic_send_photo_offline_white.svg' => ['ic_send_photo_offline_white', 36], - 'ic_send_photo_away.svg' => ['ic_send_photo_away', 36], - 'ic_send_photo_dnd.svg' => ['ic_send_photo_dnd', 36], - 'ic_send_location_online.svg' => ['ic_send_location_online', 36], - 'ic_send_location_offline.svg' => ['ic_send_location_offline', 36], - 'ic_send_location_offline_white.svg' => ['ic_send_location_offline_white', 36], - 'ic_send_location_away.svg' => ['ic_send_location_away', 36], - 'ic_send_location_dnd.svg' => ['ic_send_location_dnd', 36], - 'ic_send_voice_online.svg' => ['ic_send_voice_online', 36], - 'ic_send_voice_offline.svg' => ['ic_send_voice_offline', 36], - 'ic_send_voice_offline_white.svg' => ['ic_send_voice_offline_white', 36], - 'ic_send_voice_away.svg' => ['ic_send_voice_away', 36], - 'ic_send_voice_dnd.svg' => ['ic_send_voice_dnd', 36], - 'ic_send_cancel_online.svg' => ['ic_send_cancel_online', 36], - 'ic_send_cancel_offline.svg' => ['ic_send_cancel_offline', 36], - 'ic_send_cancel_offline_white.svg' => ['ic_send_cancel_offline_white', 36], - 'ic_send_cancel_away.svg' => ['ic_send_cancel_away', 36], - 'ic_send_cancel_dnd.svg' => ['ic_send_cancel_dnd', 36], - 'ic_send_picture_online.svg' => ['ic_send_picture_online', 36], - 'ic_send_picture_offline.svg' => ['ic_send_picture_offline', 36], - 'ic_send_picture_offline_white.svg' => ['ic_send_picture_offline_white', 36], - 'ic_send_picture_away.svg' => ['ic_send_picture_away', 36], - 'ic_send_picture_dnd.svg' => ['ic_send_picture_dnd', 36], - 'ic_send_videocam_online.svg' => ['ic_send_videocam_online', 36], - 'ic_send_videocam_offline.svg' => ['ic_send_videocam_offline', 36], - 'ic_send_videocam_offline_white.svg' => ['ic_send_videocam_offline_white', 36], - 'ic_send_videocam_away.svg' => ['ic_send_videocam_away', 36], - 'ic_send_videocam_dnd.svg' => ['ic_send_videocam_dnd', 36], - 'ic_notifications_none_white80.svg' => ['ic_notifications_none_white80', 24], - 'ic_notifications_off_white80.svg' => ['ic_notifications_off_white80', 24], - 'ic_notifications_paused_white80.svg' => ['ic_notifications_paused_white80', 24], - 'ic_notifications_white80.svg' => ['ic_notifications_white80', 24], - 'ic_verified_fingerprint.svg' => ['ic_verified_fingerprint', 36], - 'qrcode-scan.svg' => ['ic_qr_code_scan_white_24dp', 24], - 'message_bubble_received.svg' => ['message_bubble_received.9', 0], - 'message_bubble_received_non_last.svg' => ['message_bubble_received_non_last.9', 0], - 'message_bubble_received_grey.svg' => ['message_bubble_received_grey.9', 0], - 'message_bubble_received_grey_non_last.svg' => ['message_bubble_received_grey_non_last.9', 0], - 'message_bubble_received_dark.svg' => ['message_bubble_received_dark.9', 0], - 'message_bubble_received_dark_non_last.svg' => ['message_bubble_received_dark_non_last.9', 0], - 'message_bubble_received_warning.svg' => ['message_bubble_received_warning.9', 0], - 'message_bubble_received_warning_non_last.svg' => ['message_bubble_received_warning_non_last.9', 0], - 'message_bubble_received_white.svg' => ['message_bubble_received_white.9', 0], - 'message_bubble_received_white_non_last.svg' => ['message_bubble_received_white_non_last.9', 0], - 'message_bubble_sent.svg' => ['message_bubble_sent.9', 0], - 'message_bubble_sent_non_last.svg' => ['message_bubble_sent_non_last.9', 0], - 'message_bubble_sent_grey.svg' => ['message_bubble_sent_grey.9', 0], - 'message_bubble_sent_grey_non_last.svg' => ['message_bubble_send_grey_non_last.9', 0], - 'date_bubble_white.svg' => ['date_bubble_white.9', 0], - 'date_bubble_grey.svg' => ['date_bubble_grey.9', 0], - 'marker.svg' => ['marker', 0] -} - -inkscape = 'inkscape' -imagemagick = 'convert' - -def execute_cmd(cmd) - puts cmd - system cmd -end - -images.each do |source_filename, settings| - svg_content = File.read(source_filename) - output_filename, base_size = settings - - svg = XML::Document.string(svg_content) - base_width = svg.root['width'].to_i - base_height = svg.root['height'].to_i - - guides = svg.find('.//sodipodi:guide', 'sodipodi:http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd') - - resolutions.each do |resolution, factor| - if base_size.positive? - width = factor * base_size - height = factor * base_size - else - width = factor * base_width - height = factor * base_height - end - - output_parts = output_filename.split('/') - - path = if output_parts.count != 2 - "/Users/kaleksashin/Conversations1/src/main/res/drawable-#{resolution}/#{output_filename}.png" - else - "/Users/kaleksashin/Conversations1/src/#{output_parts[0]}/res/drawable-#{resolution}/#{output_parts[1]}.png" - end - execute_cmd "#{inkscape} #{source_filename} -C -w #{width.to_i} -h #{height.to_i} --export-filename=#{path}" - - top = [] - right = [] - bottom = [] - left = [] - - guides.each do |guide| - orientation = guide['orientation'] - x, y = guide['position'].split(',') - x = x.to_i - y = y.to_i - - top.push(x * factor) if (orientation == '1,0') && (y == base_height) - - right.push((base_height - y) * factor) if (orientation == '0,1') && (x == base_width) - - bottom.push(x * factor) if (orientation == '1,0') && y.zero? - - left.push((base_height - y) * factor) if (orientation == '0,1') && x.zero? - end - - next if top.length != 2 - next if right.length != 2 - next if bottom.length != 2 - next if left.length != 2 - - execute_cmd "#{imagemagick} -background none PNG32:#{path} -gravity center -extent #{width + 2}x#{height + 2} PNG32:#{path}" - - draw_format = '-draw "line %d,%d %d,%d"' - top_line = format(draw_format, top.min + 1, 0, top.max, 0) - right_line = format(draw_format, width + 1, right.min + 1, width + 1, right.max) - bottom_line = format(draw_format, bottom.min + 1, height + 1, bottom.max, height + 1) - left_line = format(draw_format, 0, left.min + 1, 0, left.max) - draws = "#{top_line} #{right_line} #{bottom_line} #{left_line}" - - execute_cmd "#{imagemagick} -background none PNG32:#{path} -fill black -stroke none #{draws} PNG32:#{path}" - end -end diff --git a/conversationsFree/.DS_Store b/conversationsFree/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..3671e9554fe503f58ba134ed899f412e258e6249 GIT binary patch literal 6148 zcmeHK%}T>S5Z<-bZYe?z3OxqA7K~O3;w8lT0!H+pQWFw17_%iw?V%KM))(?gd>&_Z zH()gfPa<{(X202;ncd6>*&oIj_h!)nV-{mffFg1<8U%+MT^lACk*hfZR socketCache = diff --git a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java index 850c0683d..6e4b2c28f 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java +++ b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java @@ -1,5 +1,7 @@ package eu.siacs.conversations.http; +import static eu.siacs.conversations.http.HttpConnectionManager.EXECUTOR; + import android.util.Log; import androidx.annotation.Nullable; @@ -33,8 +35,6 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import static eu.siacs.conversations.http.HttpConnectionManager.EXECUTOR; - public class HttpDownloadConnection implements Transferable { private final Message message; diff --git a/src/main/java/eu/siacs/conversations/ui/AboutActivity.java b/src/main/java/eu/siacs/conversations/ui/AboutActivity.java index 59a60f282..6f2e0d80e 100644 --- a/src/main/java/eu/siacs/conversations/ui/AboutActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/AboutActivity.java @@ -1,5 +1,7 @@ package eu.siacs.conversations.ui; +import static eu.siacs.conversations.ui.XmppActivity.configureActionBar; + import android.os.Bundle; import androidx.appcompat.app.AppCompatActivity; @@ -8,8 +10,6 @@ import eu.siacs.conversations.R; import eu.siacs.conversations.ui.util.SettingsUtils; import eu.siacs.conversations.utils.ThemeHelper; -import static eu.siacs.conversations.ui.XmppActivity.configureActionBar; - public class AboutActivity extends AppCompatActivity { @Override diff --git a/src/main/java/eu/siacs/conversations/ui/AboutPreference.java b/src/main/java/eu/siacs/conversations/ui/AboutPreference.java index f2cd1e348..30a2bcfb9 100644 --- a/src/main/java/eu/siacs/conversations/ui/AboutPreference.java +++ b/src/main/java/eu/siacs/conversations/ui/AboutPreference.java @@ -7,7 +7,6 @@ import android.util.AttributeSet; import eu.siacs.conversations.BuildConfig; import eu.siacs.conversations.R; -import eu.siacs.conversations.utils.PhoneHelper; public class AboutPreference extends Preference { public AboutPreference(final Context context, final AttributeSet attrs, final int defStyle) { diff --git a/src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java b/src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java index 21cf7d80f..80603cc0f 100644 --- a/src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java @@ -9,7 +9,6 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.inputmethod.InputMethodManager; -import android.widget.ArrayAdapter; import android.widget.EditText; import android.widget.ListView; import android.widget.TextView; diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java index 89c5f9a52..7768c55f6 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java @@ -1,5 +1,8 @@ package eu.siacs.conversations.ui; +import static eu.siacs.conversations.entities.Bookmark.printableValue; +import static eu.siacs.conversations.utils.StringUtils.changed; + import android.app.Activity; import android.app.PendingIntent; import android.content.Context; @@ -62,9 +65,6 @@ import eu.siacs.conversations.utils.XmppUri; import eu.siacs.conversations.xmpp.Jid; import me.drakeet.support.toast.ToastCompat; -import static eu.siacs.conversations.entities.Bookmark.printableValue; -import static eu.siacs.conversations.utils.StringUtils.changed; - public class ConferenceDetailsActivity extends XmppActivity implements OnConversationUpdate, OnMucRosterUpdate, XmppConnectionService.OnAffiliationChanged, XmppConnectionService.OnConfigurationPushed, XmppConnectionService.OnRoomDestroy, TextWatcher, OnMediaLoaded { public static final String ACTION_VIEW_MUC = "view_muc"; diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java index a125c9061..79177eb55 100644 --- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java @@ -7,7 +7,6 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageManager; -import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -18,14 +17,12 @@ import android.provider.ContactsContract.Intents; import android.text.Spannable; import android.text.SpannableString; import android.text.style.RelativeSizeSpan; -import android.util.TypedValue; -import android.view.inputmethod.InputMethodManager; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; -import android.view.ViewGroup; +import android.view.inputmethod.InputMethodManager; import android.widget.ArrayAdapter; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; @@ -76,7 +73,6 @@ import eu.siacs.conversations.utils.IrregularUnicodeDetector; import eu.siacs.conversations.utils.PhoneNumberUtilWrapper; import eu.siacs.conversations.utils.UIHelper; import eu.siacs.conversations.utils.XmppUri; -import eu.siacs.conversations.xml.Element; import eu.siacs.conversations.xml.Namespace; import eu.siacs.conversations.xmpp.Jid; import eu.siacs.conversations.xmpp.OnKeyStatusUpdated; diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java index bb76ea271..1836ed157 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java @@ -67,7 +67,6 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.Objects; import java.util.concurrent.atomic.AtomicBoolean; import eu.siacs.conversations.Config; diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java index 2527167aa..2e7f499c6 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java @@ -29,6 +29,9 @@ package eu.siacs.conversations.ui; +import static androidx.recyclerview.widget.ItemTouchHelper.LEFT; +import static androidx.recyclerview.widget.ItemTouchHelper.RIGHT; + import android.app.Activity; import android.app.AlertDialog; import android.app.Fragment; @@ -57,7 +60,6 @@ import com.google.common.base.Optional; import com.google.common.collect.Collections2; import java.util.ArrayList; -import java.util.Collections; import java.util.Comparator; import java.util.List; import java.util.Map; @@ -73,7 +75,6 @@ import eu.siacs.conversations.entities.Contact; import eu.siacs.conversations.entities.Conversation; import eu.siacs.conversations.entities.Conversational; import eu.siacs.conversations.entities.ListItem; -import eu.siacs.conversations.entities.Presence; import eu.siacs.conversations.services.XmppConnectionService; import eu.siacs.conversations.ui.adapter.ConversationAdapter; import eu.siacs.conversations.ui.interfaces.OnConversationArchived; @@ -89,9 +90,6 @@ import eu.siacs.conversations.utils.EasyOnboardingInvite; import eu.siacs.conversations.utils.ThemeHelper; import eu.siacs.conversations.xmpp.jingle.OngoingRtpSession; -import static androidx.recyclerview.widget.ItemTouchHelper.LEFT; -import static androidx.recyclerview.widget.ItemTouchHelper.RIGHT; - public class ConversationsOverviewFragment extends XmppFragment { private static final String STATE_SCROLL_POSITION = ConversationsOverviewFragment.class.getName()+".scroll_state"; diff --git a/src/main/java/eu/siacs/conversations/ui/CreatePublicChannelDialog.java b/src/main/java/eu/siacs/conversations/ui/CreatePublicChannelDialog.java index 8f5e2e6d2..e6f1cb27e 100644 --- a/src/main/java/eu/siacs/conversations/ui/CreatePublicChannelDialog.java +++ b/src/main/java/eu/siacs/conversations/ui/CreatePublicChannelDialog.java @@ -17,7 +17,6 @@ import androidx.appcompat.app.AlertDialog; import androidx.databinding.DataBindingUtil; import androidx.fragment.app.DialogFragment; -import java.security.SecureRandom; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java b/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java index f0793f743..bb4601c94 100644 --- a/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java +++ b/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java @@ -2,8 +2,6 @@ package eu.siacs.conversations.ui; import android.app.Activity; import android.app.Dialog; -import android.content.DialogInterface.OnClickListener; -import android.content.DialogInterface; import android.os.Bundle; import android.text.Editable; import android.text.InputType; @@ -14,15 +12,14 @@ import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.ArrayAdapter; -import android.widget.TextView; import android.widget.ToggleButton; import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; import androidx.databinding.DataBindingUtil; import androidx.fragment.app.DialogFragment; -import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import java.util.ArrayList; import java.util.Arrays; @@ -31,22 +28,21 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import io.michaelrocks.libphonenumber.android.NumberParseException; - import eu.siacs.conversations.Config; import eu.siacs.conversations.R; import eu.siacs.conversations.databinding.EnterJidDialogBinding; -import eu.siacs.conversations.services.XmppConnectionService; import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.entities.Contact; import eu.siacs.conversations.entities.Presence; import eu.siacs.conversations.entities.ServiceDiscoveryResult; +import eu.siacs.conversations.services.XmppConnectionService; import eu.siacs.conversations.ui.adapter.KnownHostsAdapter; import eu.siacs.conversations.ui.interfaces.OnBackendConnected; import eu.siacs.conversations.ui.util.DelayedHintHelper; import eu.siacs.conversations.utils.PhoneNumberUtilWrapper; import eu.siacs.conversations.xmpp.Jid; import eu.siacs.conversations.xmpp.OnGatewayResult; +import io.michaelrocks.libphonenumber.android.NumberParseException; public class EnterJidDialog extends DialogFragment implements OnBackendConnected, TextWatcher { diff --git a/src/main/java/eu/siacs/conversations/ui/LocationActivity.java b/src/main/java/eu/siacs/conversations/ui/LocationActivity.java index 49ca027c0..2b6f1333a 100644 --- a/src/main/java/eu/siacs/conversations/ui/LocationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/LocationActivity.java @@ -37,9 +37,9 @@ import eu.siacs.conversations.R; import eu.siacs.conversations.http.HttpConnectionManager; import eu.siacs.conversations.services.QuickConversationsService; import eu.siacs.conversations.ui.util.LocationHelper; +import eu.siacs.conversations.ui.util.SettingsUtils; import eu.siacs.conversations.ui.widget.Marker; import eu.siacs.conversations.ui.widget.MyLocation; -import eu.siacs.conversations.ui.util.SettingsUtils; import eu.siacs.conversations.utils.ThemeHelper; public abstract class LocationActivity extends ActionBarActivity implements LocationListener { diff --git a/src/main/java/eu/siacs/conversations/ui/MucUsersActivity.java b/src/main/java/eu/siacs/conversations/ui/MucUsersActivity.java index e759ee18e..01f3d962f 100644 --- a/src/main/java/eu/siacs/conversations/ui/MucUsersActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/MucUsersActivity.java @@ -17,11 +17,9 @@ import androidx.annotation.NonNull; import androidx.databinding.DataBindingUtil; import com.google.common.collect.Collections2; -import com.google.common.collect.Lists; import com.google.common.collect.Ordering; import java.util.ArrayList; -import java.util.Collections; import java.util.Locale; import eu.siacs.conversations.R; diff --git a/src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java index 658567aa6..a6759cc42 100644 --- a/src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java @@ -29,6 +29,8 @@ package eu.siacs.conversations.ui; +import static eu.siacs.conversations.ui.PublishProfilePictureActivity.REQUEST_CHOOSE_PICTURE; + import android.content.Intent; import android.graphics.Bitmap; import android.net.Uri; @@ -40,6 +42,8 @@ import android.widget.Toast; import androidx.annotation.StringRes; import androidx.databinding.DataBindingUtil; +import com.canhub.cropper.CropImage; + import eu.siacs.conversations.Config; import eu.siacs.conversations.R; import eu.siacs.conversations.databinding.ActivityPublishProfilePictureBinding; @@ -47,10 +51,6 @@ import eu.siacs.conversations.entities.Conversation; import eu.siacs.conversations.ui.interfaces.OnAvatarPublication; import eu.siacs.conversations.ui.util.PendingItem; -import static eu.siacs.conversations.ui.PublishProfilePictureActivity.REQUEST_CHOOSE_PICTURE; - -import com.canhub.cropper.CropImage; - public class PublishGroupChatProfilePictureActivity extends XmppActivity implements OnAvatarPublication { private final PendingItem pendingConversationUuid = new PendingItem<>(); private ActivityPublishProfilePictureBinding binding; diff --git a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java index 9759841df..cfd702364 100644 --- a/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/RtpSessionActivity.java @@ -1,8 +1,7 @@ package eu.siacs.conversations.ui; -import static eu.siacs.conversations.utils.PermissionUtils.getFirstDenied; - import static java.util.Arrays.asList; +import static eu.siacs.conversations.utils.PermissionUtils.getFirstDenied; import android.Manifest; import android.annotation.SuppressLint; @@ -59,7 +58,6 @@ import eu.siacs.conversations.entities.Contact; import eu.siacs.conversations.entities.Conversation; import eu.siacs.conversations.services.AppRTCAudioManager; import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.ui.widget.DialpadView; import eu.siacs.conversations.ui.util.AvatarWorkerTask; import eu.siacs.conversations.ui.util.MainThreadExecutor; import eu.siacs.conversations.ui.util.Rationals; @@ -74,16 +72,6 @@ import eu.siacs.conversations.xmpp.jingle.Media; import eu.siacs.conversations.xmpp.jingle.RtpCapability; import eu.siacs.conversations.xmpp.jingle.RtpEndUserState; -import org.webrtc.RendererCommon; -import org.webrtc.SurfaceViewRenderer; -import org.webrtc.VideoTrack; - -import java.lang.ref.WeakReference; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.Set; - public class RtpSessionActivity extends XmppActivity implements XmppConnectionService.OnJingleRtpConnectionUpdate, eu.siacs.conversations.ui.widget.SurfaceViewRenderer.OnAspectRatioChanged { diff --git a/src/main/java/eu/siacs/conversations/ui/SearchActivity.java b/src/main/java/eu/siacs/conversations/ui/SearchActivity.java index 7967ba284..df14b5272 100644 --- a/src/main/java/eu/siacs/conversations/ui/SearchActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/SearchActivity.java @@ -29,6 +29,9 @@ package eu.siacs.conversations.ui; +import static eu.siacs.conversations.ui.util.SoftKeyboardUtils.hideSoftKeyboard; +import static eu.siacs.conversations.ui.util.SoftKeyboardUtils.showKeyboard; + import android.app.PendingIntent; import android.content.Intent; import android.os.Bundle; @@ -70,10 +73,6 @@ import eu.siacs.conversations.ui.util.ShareUtil; import eu.siacs.conversations.ui.util.StyledAttributes; import eu.siacs.conversations.utils.FtsUtils; import eu.siacs.conversations.utils.MessageUtils; -import eu.siacs.conversations.utils.UIHelper; - -import static eu.siacs.conversations.ui.util.SoftKeyboardUtils.hideSoftKeyboard; -import static eu.siacs.conversations.ui.util.SoftKeyboardUtils.showKeyboard; public class SearchActivity extends XmppActivity implements TextWatcher, OnSearchResultsAvailable, MessageAdapter.OnContactPictureClicked { diff --git a/src/main/java/eu/siacs/conversations/ui/SendLogActivity.java b/src/main/java/eu/siacs/conversations/ui/SendLogActivity.java index 7be1deeb3..8dabc77cd 100644 --- a/src/main/java/eu/siacs/conversations/ui/SendLogActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/SendLogActivity.java @@ -48,23 +48,18 @@ import android.os.Bundle; import android.util.Log; import androidx.core.app.ShareCompat; -import androidx.core.content.FileProvider; import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.File; -import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.io.InputStreamReader; import java.util.ArrayList; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import eu.siacs.conversations.Config; import eu.siacs.conversations.R; import eu.siacs.conversations.persistance.FileBackend; -import eu.siacs.conversations.services.BarcodeProvider; public class SendLogActivity extends ActionBarActivity { public final static String TAG = "com.xtralogic.android.logcollector"; diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index 660efbb03..f119dfb76 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java @@ -9,11 +9,7 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageManager; -import android.content.res.Resources; import android.database.DataSetObserver; -import android.graphics.Color; -import android.graphics.drawable.ColorDrawable; -import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -25,7 +21,6 @@ import android.text.method.LinkMovementMethod; import android.util.AttributeSet; import android.util.Log; import android.util.Pair; -import android.util.TypedValue; import android.view.ContextMenu; import android.view.ContextMenu.ContextMenuInfo; import android.view.KeyEvent; @@ -34,7 +29,6 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; -import android.view.ViewParent; import android.view.inputmethod.InputMethodManager; import android.widget.AdapterView; import android.widget.AdapterView.AdapterContextMenuInfo; @@ -47,7 +41,6 @@ import android.widget.ExpandableListView; import android.widget.FrameLayout; import android.widget.ListAdapter; import android.widget.ListView; -import android.widget.Space; import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; @@ -85,7 +78,6 @@ import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.function.Function; import java.util.stream.Collectors; import eu.siacs.conversations.Config; @@ -110,7 +102,6 @@ import eu.siacs.conversations.ui.util.SoftKeyboardUtils; import eu.siacs.conversations.ui.util.StyledAttributes; import eu.siacs.conversations.ui.widget.SwipeRefreshListFragment; import eu.siacs.conversations.utils.AccountUtils; -import eu.siacs.conversations.utils.StringUtils; import eu.siacs.conversations.utils.UIHelper; import eu.siacs.conversations.utils.XmppUri; import eu.siacs.conversations.xmpp.Jid; diff --git a/src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java b/src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java index b1b91c99c..6c5516055 100644 --- a/src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java @@ -18,6 +18,13 @@ import androidx.databinding.DataBindingUtil; import com.google.common.base.Strings; +import org.jetbrains.annotations.NotNull; + +import java.io.IOException; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + import eu.siacs.conversations.Config; import eu.siacs.conversations.R; import eu.siacs.conversations.databinding.ActivityUriHandlerBinding; @@ -29,20 +36,12 @@ import eu.siacs.conversations.utils.SignupUtils; import eu.siacs.conversations.utils.ThemeHelper; import eu.siacs.conversations.utils.XmppUri; import eu.siacs.conversations.xmpp.Jid; - import okhttp3.Call; import okhttp3.Callback; import okhttp3.HttpUrl; import okhttp3.Request; import okhttp3.Response; -import org.jetbrains.annotations.NotNull; - -import java.io.IOException; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - public class UriHandlerActivity extends AppCompatActivity { public static final String ACTION_SCAN_QR_CODE = "scan_qr_code"; diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java index e817b760f..47ce3be01 100644 --- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java @@ -91,12 +91,6 @@ import eu.siacs.conversations.xmpp.Jid; import eu.siacs.conversations.xmpp.OnKeyStatusUpdated; import eu.siacs.conversations.xmpp.OnUpdateBlocklist; -import java.io.IOException; -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.RejectedExecutionException; - public abstract class XmppActivity extends ActionBarActivity { public static final String EXTRA_ACCOUNT = "account"; diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java index 735460bf4..c22546891 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java @@ -2,8 +2,6 @@ package eu.siacs.conversations.ui.adapter; import android.content.Context; import android.content.SharedPreferences; -import android.content.res.TypedArray; -import android.database.DataSetObserver; import android.graphics.Typeface; import android.preference.PreferenceManager; import android.util.Pair; @@ -20,8 +18,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.google.common.base.Optional; import com.google.common.base.Strings; -import org.checkerframework.checker.units.qual.C; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MediaPreviewAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MediaPreviewAdapter.java index 7fbfb8e89..123ed6c29 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MediaPreviewAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MediaPreviewAdapter.java @@ -10,7 +10,6 @@ import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.AsyncTask; import android.view.LayoutInflater; -import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.Toast; @@ -23,6 +22,7 @@ import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; import java.util.concurrent.RejectedExecutionException; + import eu.siacs.conversations.R; import eu.siacs.conversations.databinding.MediaPreviewBinding; import eu.siacs.conversations.persistance.FileBackend; diff --git a/src/main/java/eu/siacs/conversations/ui/util/Attachment.java b/src/main/java/eu/siacs/conversations/ui/util/Attachment.java index e68bcc534..5f41484a1 100644 --- a/src/main/java/eu/siacs/conversations/ui/util/Attachment.java +++ b/src/main/java/eu/siacs/conversations/ui/util/Attachment.java @@ -46,7 +46,6 @@ import java.util.Collections; import java.util.List; import java.util.UUID; -import eu.siacs.conversations.utils.Compatibility; import eu.siacs.conversations.utils.MimeUtils; public class Attachment implements Parcelable { diff --git a/src/main/java/eu/siacs/conversations/ui/util/MyLinkify.java b/src/main/java/eu/siacs/conversations/ui/util/MyLinkify.java index d5d3a82da..dfff1c0de 100644 --- a/src/main/java/eu/siacs/conversations/ui/util/MyLinkify.java +++ b/src/main/java/eu/siacs/conversations/ui/util/MyLinkify.java @@ -42,7 +42,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Locale; -import java.util.Objects; import eu.siacs.conversations.ui.text.FixedURLSpan; import eu.siacs.conversations.utils.GeoHelper; diff --git a/src/main/java/eu/siacs/conversations/ui/util/ViewUtil.java b/src/main/java/eu/siacs/conversations/ui/util/ViewUtil.java index 1cc630ad3..a027816d5 100644 --- a/src/main/java/eu/siacs/conversations/ui/util/ViewUtil.java +++ b/src/main/java/eu/siacs/conversations/ui/util/ViewUtil.java @@ -3,14 +3,11 @@ package eu.siacs.conversations.ui.util; import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; -import android.content.pm.PackageManager; -import android.content.pm.ResolveInfo; import android.net.Uri; import android.util.Log; import android.widget.Toast; import java.io.File; -import java.util.List; import eu.siacs.conversations.Config; import eu.siacs.conversations.R; diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/ToneManager.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/ToneManager.java index 4b4b23d82..bb0ee5c68 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/ToneManager.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/ToneManager.java @@ -1,11 +1,15 @@ package eu.siacs.conversations.xmpp.jingle; +import static java.util.Arrays.asList; + import android.content.Context; import android.media.AudioManager; import android.media.ToneGenerator; import android.os.Build; import android.util.Log; +import androidx.core.content.ContextCompat; + import java.util.Arrays; import java.util.Set; import java.util.concurrent.ScheduledFuture; @@ -13,10 +17,6 @@ import java.util.concurrent.TimeUnit; import eu.siacs.conversations.Config; -import static java.util.Arrays.asList; - -import androidx.core.content.ContextCompat; - class ToneManager { private ToneGenerator toneGenerator; diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/IceUdpTransportInfo.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/IceUdpTransportInfo.java index ccaba56a6..5d31632f1 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/IceUdpTransportInfo.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/IceUdpTransportInfo.java @@ -16,11 +16,6 @@ import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xml.Namespace; -import eu.siacs.conversations.xmpp.jingle.SessionDescription; - import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -32,6 +27,11 @@ import java.util.Locale; import java.util.Map; import java.util.UUID; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xml.Namespace; +import eu.siacs.conversations.xmpp.jingle.SessionDescription; + public class IceUdpTransportInfo extends GenericTransportInfo { public static final IceUdpTransportInfo STUB = new IceUdpTransportInfo(); diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java index 669a01c49..f734e0685 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java @@ -5,7 +5,6 @@ import androidx.annotation.NonNull; import com.google.common.base.CaseFormat; import com.google.common.base.Throwables; -import eu.siacs.conversations.crypto.axolotl.AxolotlService; import eu.siacs.conversations.crypto.axolotl.CryptoFailedException; import eu.siacs.conversations.xmpp.jingle.RtpContentMap; diff --git a/src/main/res/drawable/ic_launcher_foreground.xml b/src/main/res/drawable/ic_launcher_foreground.xml index ae9905e04..30f50623e 100644 --- a/src/main/res/drawable/ic_launcher_foreground.xml +++ b/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,9 +1,8 @@ + android:width="108dp" + android:height="108dp" + android:viewportWidth="1163.6364" + android:viewportHeight="1163.6364"> + xmlns:app="http://schemas.android.com/apk/res-auto"> diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml index 03f002149..bd1a084a6 100644 --- a/src/main/res/layout/activity_trust_keys.xml +++ b/src/main/res/layout/activity_trust_keys.xml @@ -1,6 +1,5 @@ - + - +