From 96736a8095c253832d8050fb9f37c5266e9dfd23 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Wed, 19 Aug 2020 10:06:26 +1000 Subject: [PATCH 1/3] Raise deployment target and migrate to AndroidX --- AndroidManifest.xml | 2 +- build.gradle | 42 +++++++++---------- gradle.properties | 2 + res/layout/activity_contact_name_edit.xml | 2 +- res/layout/activity_contact_share_edit.xml | 4 +- res/layout/activity_create_closed_group.xml | 2 +- res/layout/activity_create_private_chat.xml | 6 +-- res/layout/activity_edit_closed_group.xml | 2 +- res/layout/activity_home.xml | 6 +-- res/layout/activity_join_public_chat.xml | 6 +-- res/layout/activity_link_device.xml | 6 +-- res/layout/activity_linked_devices.xml | 2 +- res/layout/activity_qr_code.xml | 6 +-- res/layout/activity_select_contacts.xml | 2 +- res/layout/activity_settings.xml | 4 +- .../activity_shared_contact_details.xml | 16 +++---- res/layout/captcha_activity.xml | 4 +- res/layout/change_passphrase_activity.xml | 12 +++--- .../contact_selection_list_fragment.xml | 6 +-- res/layout/conversation_activity.xml | 4 +- res/layout/conversation_fragment.xml | 2 +- res/layout/conversation_input_panel.xml | 2 +- res/layout/conversation_list_activity.xml | 4 +- res/layout/conversation_list_fragment.xml | 6 +-- res/layout/conversation_search_nav.xml | 2 +- res/layout/device_link_fragment.xml | 4 +- res/layout/emoji_grid_layout.xml | 2 +- res/layout/enter_backup_passphrase_dialog.xml | 6 +-- res/layout/experience_upgrade_activity.xml | 2 +- ...erience_upgrade_link_previews_fragment.xml | 6 +-- ...experience_upgrade_preference_fragment.xml | 2 +- ...nce_upgrade_typing_indicators_fragment.xml | 4 +- res/layout/fragment_search.xml | 2 +- res/layout/fragment_submit_log.xml | 2 +- res/layout/giphy_activity.xml | 12 +++--- res/layout/giphy_fragment.xml | 2 +- res/layout/image_editor_hud.xml | 6 +-- res/layout/item_editable_contact.xml | 2 +- res/layout/link_preview.xml | 4 +- res/layout/media_keyboard.xml | 6 +-- res/layout/media_overview_activity.xml | 10 ++--- .../media_overview_documents_fragment.xml | 2 +- .../media_overview_gallery_fragment.xml | 2 +- res/layout/media_preview_activity.xml | 2 +- res/layout/mediapicker_folder_fragment.xml | 4 +- res/layout/mediapicker_item_fragment.xml | 4 +- res/layout/mediasend_fragment.xml | 2 +- res/layout/profile_create_activity.xml | 4 +- res/layout/prompt_passphrase_activity.xml | 4 +- res/layout/recent_photo_view.xml | 2 +- res/layout/recipient_preference_activity.xml | 20 ++++----- .../recipient_preference_photo_rail.xml | 2 +- res/layout/recording_layout.xml | 4 +- res/layout/registration_activity.xml | 10 ++--- res/layout/registration_lock_dialog_view.xml | 12 +++--- .../registration_lock_reminder_view.xml | 6 +-- res/layout/registration_welcome_activity.xml | 4 +- .../scribble_select_sticker_activity.xml | 4 +- .../scribble_select_sticker_fragment.xml | 2 +- res/layout/search_toolbar.xml | 2 +- res/layout/share_activity.xml | 4 +- res/layout/sticker_keyboard_page.xml | 2 +- res/layout/sticker_management_activity.xml | 2 +- .../sticker_management_sticker_item.xml | 4 +- res/layout/sticker_preview_activity.xml | 10 ++--- res/layout/switch_compat_preference.xml | 2 +- res/layout/verify_display_fragment.xml | 2 +- res/layout/webrtc_call_screen.xml | 6 +-- res/menu/conversation.xml | 2 +- res/menu/conversation_list_search.xml | 2 +- .../securesms/ApplicationContext.java | 12 +++--- .../ApplicationPreferencesActivity.java | 16 +++---- .../securesms/BaseActionBarActivity.java | 10 ++--- .../thoughtcrime/securesms/BaseActivity.java | 4 +- .../securesms/BasicIntroFragment.java | 4 +- .../securesms/BindableConversationItem.java | 4 +- .../BindableConversationListItem.java | 3 +- .../securesms/BlockedContactsActivity.java | 12 +++--- .../securesms/ClearProfileAvatarActivity.java | 2 +- .../securesms/ConfirmIdentityDialog.java | 2 +- .../securesms/ContactSelectionActivity.java | 2 +- .../securesms/ConversationListActivity.java | 7 ++-- .../securesms/ConversationListAdapter.java | 6 +-- .../securesms/ConversationListFragment.java | 25 ++++++----- .../securesms/ConversationListItem.java | 4 +- .../securesms/ConversationListItemAction.java | 2 +- .../ConversationListItemInboxZero.java | 6 +-- .../securesms/CountrySelectionFragment.java | 8 ++-- .../securesms/CreateProfileActivity.java | 4 +- .../securesms/DatabaseUpgradeActivity.java | 3 +- .../securesms/DeviceActivity.java | 2 +- .../securesms/DeviceAddFragment.java | 4 +- .../securesms/DeviceLinkFragment.java | 4 +- .../securesms/DeviceListFragment.java | 10 ++--- .../securesms/DeviceProvisioningActivity.java | 2 +- .../securesms/ExperienceUpgradeActivity.java | 10 ++--- .../securesms/ExpirationDialog.java | 4 +- .../securesms/GroupCreateActivity.java | 4 +- .../securesms/GroupMembersDialog.java | 2 +- .../securesms/IntroPagerAdapter.java | 6 +-- .../securesms/InviteActivity.java | 6 +-- .../securesms/LinkPreviewsIntroFragment.java | 4 +- .../securesms/LogSubmitActivity.java | 2 +- .../securesms/MediaDocumentsAdapter.java | 4 +- .../securesms/MediaGalleryAdapter.java | 2 +- .../securesms/MediaOverviewActivity.java | 30 ++++++------- .../securesms/MediaPreviewActivity.java | 22 +++++----- .../securesms/MessageDetailsActivity.java | 9 ++-- .../MessageDetailsRecipientAdapter.java | 2 +- .../thoughtcrime/securesms/MuteDialog.java | 4 +- .../securesms/PassphrasePromptActivity.java | 6 +-- .../PassphraseRequiredActionBarActivity.java | 8 ++-- .../securesms/ReadReceiptsIntroFragment.java | 6 +-- .../RecipientPreferenceActivity.java | 26 ++++++------ .../securesms/RegistrationActivity.java | 6 +-- .../thoughtcrime/securesms/ShareActivity.java | 6 +-- .../securesms/ShortcutLauncherActivity.java | 8 ++-- .../securesms/SmsSendtoActivity.java | 2 +- .../securesms/TransportOption.java | 4 +- .../securesms/TransportOptions.java | 6 +-- .../securesms/TransportOptionsAdapter.java | 2 +- .../securesms/TransportOptionsPopup.java | 4 +- .../TypingIndicatorIntroFragment.java | 4 +- .../securesms/VerifyIdentityActivity.java | 12 +++--- .../securesms/WebRtcCallActivity.java | 4 +- .../securesms/attachments/Attachment.java | 4 +- .../securesms/attachments/AttachmentId.java | 2 +- .../attachments/AttachmentServer.java | 2 +- .../attachments/DatabaseAttachment.java | 2 +- .../MmsNotificationAttachment.java | 2 +- .../attachments/PointerAttachment.java | 4 +- .../securesms/attachments/UriAttachment.java | 4 +- .../securesms/audio/AudioRecorder.java | 2 +- .../securesms/audio/AudioSlidePlayer.java | 4 +- .../securesms/avatar/AvatarSelection.java | 6 +-- .../securesms/backup/BackupDialog.java | 4 +- .../securesms/backup/BackupPassphrase.java | 4 +- .../securesms/backup/FullBackupBase.java | 4 +- .../securesms/backup/FullBackupExporter.java | 4 +- .../securesms/backup/FullBackupImporter.java | 2 +- .../securesms/color/MaterialColor.java | 6 +-- .../securesms/color/MaterialColors.java | 4 +- .../components/AccessibleToggleButton.java | 2 +- .../components/AlbumThumbnailView.java | 8 ++-- .../securesms/components/AlertView.java | 2 +- .../securesms/components/AnimatingToggle.java | 6 +-- .../components/AttachmentTypeSelector.java | 6 +-- .../securesms/components/AudioView.java | 4 +- .../securesms/components/AvatarImageView.java | 6 +-- .../components/CircleColorImageView.java | 2 +- .../securesms/components/ComposeText.java | 14 +++---- .../components/ContactFilterToolbar.java | 2 +- .../components/ControllableTabLayout.java | 2 +- .../components/ControllableViewPager.java | 6 +-- .../components/ConversationItemFooter.java | 4 +- .../components/ConversationItemThumbnail.java | 8 ++-- .../ConversationSearchBottomBar.java | 6 +-- .../components/ConversationTypingView.java | 4 +- .../securesms/components/CornerMask.java | 4 +- .../components/CustomDefaultPreference.java | 8 ++-- .../securesms/components/DocumentView.java | 6 +-- .../components/ExpirationTimerView.java | 6 +-- .../securesms/components/FromTextView.java | 3 +- .../GlideBitmapListeningTarget.java | 4 +- .../GlideDrawableListeningTarget.java | 4 +- .../components/HidingLinearLayout.java | 7 +--- .../securesms/components/ImageDivet.java | 2 +- .../components/InputAwareLayout.java | 4 +- .../securesms/components/InputPanel.java | 14 +++---- .../components/KeyboardAwareLinearLayout.java | 2 +- .../securesms/components/LabeledEditText.java | 6 +-- .../securesms/components/LinkPreviewView.java | 4 +- .../components/MaxHeightScrollView.java | 2 +- .../securesms/components/MediaView.java | 7 ++-- .../components/MicrophoneRecorderView.java | 6 +-- .../securesms/components/Outliner.java | 9 +--- .../components/PushRecipientsPanel.java | 4 +- .../securesms/components/QuoteView.java | 6 +-- .../securesms/components/RatingManager.java | 2 +- .../components/RecentPhotoViewRail.java | 15 ++++--- .../components/RecyclerViewFastScroller.java | 8 ++-- .../RemovableEditableMediaView.java | 4 +- .../components/RepeatableImageKey.java | 2 +- .../securesms/components/SearchToolbar.java | 14 ++++--- .../securesms/components/SendButton.java | 4 +- .../components/SharedContactView.java | 6 +-- .../securesms/components/SquareImageView.java | 2 +- .../securesms/components/StickerView.java | 4 +- .../components/SwitchPreferenceCompat.java | 5 +-- .../components/ThreadPhotoRailView.java | 10 ++--- .../securesms/components/ThumbnailView.java | 4 +- .../securesms/components/TooltipPopup.java | 8 ++-- .../components/TransferControlView.java | 6 +-- .../components/TypingIndicatorView.java | 3 +- .../components/TypingStatusRepository.java | 6 +-- .../components/TypingStatusSender.java | 2 +- .../components/ZoomingImageView.java | 4 +- .../components/camera/CameraUtils.java | 4 +- .../components/camera/CameraView.java | 4 +- .../components/emoji/AsciiEmojiView.java | 2 +- .../emoji/CompositeEmojiPageModel.java | 10 ++--- .../components/emoji/EmojiEditText.java | 6 +-- .../emoji/EmojiKeyboardProvider.java | 6 +-- .../components/emoji/EmojiPageView.java | 6 +-- .../emoji/EmojiPageViewGridAdapter.java | 4 +- .../components/emoji/EmojiProvider.java | 4 +- .../securesms/components/emoji/EmojiSpan.java | 2 +- .../components/emoji/EmojiTextView.java | 8 ++-- .../components/emoji/EmojiToggle.java | 4 +- .../emoji/EmojiVariationSelectorPopup.java | 2 +- .../components/emoji/MediaKeyboard.java | 12 +++--- .../emoji/MediaKeyboardBottomTabAdapter.java | 4 +- .../emoji/MediaKeyboardProvider.java | 8 ++-- .../emoji/RecentEmojiPageModel.java | 2 +- .../emoji/StaticEmojiPageModel.java | 6 +-- .../emoji/parsing/EmojiDrawInfo.java | 2 +- .../emoji/parsing/EmojiPageBitmap.java | 6 +-- .../components/emoji/parsing/EmojiParser.java | 4 +- .../components/emoji/parsing/EmojiTree.java | 2 +- .../identity/UntrustedSendDialog.java | 4 +- .../identity/UnverifiedBannerView.java | 6 +-- .../identity/UnverifiedSendDialog.java | 4 +- .../components/location/SignalPlace.java | 4 +- .../recyclerview/DeleteItemAnimator.java | 4 +- .../SmoothScrollingLinearLayoutManager.java | 6 +-- .../registration/CallMeCountDownView.java | 12 +----- .../PulsingFloatingActionButton.java | 2 +- .../registration/VerificationCodeView.java | 8 ++-- .../registration/VerificationPinKeyboard.java | 6 +-- .../components/reminder/DozeReminder.java | 4 +- .../components/reminder/InviteReminder.java | 2 +- .../components/reminder/Reminder.java | 4 +- .../reminder/ServiceOutageReminder.java | 2 +- .../components/reminder/ShareReminder.java | 2 +- .../ExtendedOnPageChangedListener.java | 2 +- .../components/viewpager/HackyViewPager.java | 2 +- .../components/webrtc/PercentFrameLayout.java | 11 ----- .../webrtc/WebRtcAnswerDeclineButton.java | 4 +- .../components/webrtc/WebRtcCallControls.java | 3 +- .../components/webrtc/WebRtcCallScreen.java | 9 ++-- .../contacts/ContactsCursorLoader.java | 6 +-- .../securesms/contacts/ContactsDatabase.java | 4 +- .../securesms/contacts/RecipientsEditor.java | 2 +- .../contacts/avatars/ContactColors.java | 3 +- .../contacts/avatars/ContactColorsLegacy.java | 3 +- .../contacts/avatars/ContactPhoto.java | 4 +- .../avatars/GeneratedContactPhoto.java | 8 ++-- .../avatars/GroupRecordContactPhoto.java | 4 +- .../contacts/avatars/ProfileContactPhoto.java | 4 +- .../avatars/ResourceContactPhoto.java | 4 +- .../contacts/avatars/SystemContactPhoto.java | 4 +- .../avatars/TransparentContactPhoto.java | 2 +- .../securesms/contactshare/Contact.java | 4 +- .../contactshare/ContactFieldAdapter.java | 6 +-- .../contactshare/ContactModelMapper.java | 4 +- .../contactshare/ContactNameEditActivity.java | 6 +-- .../ContactNameEditViewModel.java | 11 +++-- .../contactshare/ContactRepository.java | 6 +-- .../ContactShareEditActivity.java | 12 +++--- .../contactshare/ContactShareEditAdapter.java | 12 +++--- .../ContactShareEditViewModel.java | 10 ++--- .../securesms/contactshare/ContactUtil.java | 10 ++--- .../SharedContactDetailsActivity.java | 10 ++--- .../conversation/ConversationActivity.java | 24 +++++------ .../conversation/ConversationAdapter.java | 10 ++--- .../conversation/ConversationFragment.java | 26 ++++++------ .../conversation/ConversationItem.java | 8 ++-- .../ConversationPopupActivity.java | 2 +- .../ConversationSearchViewModel.java | 6 +-- .../ConversationStickerSuggestionAdapter.java | 4 +- .../ConversationStickerViewModel.java | 10 ++--- .../conversation/ConversationTitleView.java | 4 +- .../conversation/ConversationUpdateItem.java | 4 +- .../securesms/crypto/AttachmentSecret.java | 2 +- .../crypto/AttachmentSecretProvider.java | 2 +- .../ClassicDecryptingPartInputStream.java | 2 +- .../securesms/crypto/DatabaseSecret.java | 2 +- .../crypto/DatabaseSecretProvider.java | 2 +- .../securesms/crypto/IdentityKeyUtil.java | 2 +- .../securesms/crypto/KeyStoreHelper.java | 4 +- .../securesms/crypto/MasterCipher.java | 2 +- .../securesms/crypto/MasterSecretUtil.java | 4 +- .../ModernDecryptingPartInputStream.java | 2 +- .../ModernEncryptingPartOutputStream.java | 2 +- .../securesms/crypto/ProfileKeyUtil.java | 4 +- .../securesms/crypto/SessionUtil.java | 5 +-- .../crypto/UnidentifiedAccessUtil.java | 6 +-- .../crypto/storage/TextSecurePreKeyStore.java | 2 +- .../storage/TextSecureSessionStore.java | 2 +- .../securesms/database/Address.java | 6 +-- .../database/AttachmentDatabase.java | 6 +-- .../securesms/database/CursorList.java | 4 +- .../database/CursorRecyclerViewAdapter.java | 10 ++--- .../securesms/database/Database.java | 2 +- .../database/DatabaseContentProviders.java | 4 +- .../securesms/database/DatabaseFactory.java | 2 +- .../securesms/database/DraftDatabase.java | 2 +- .../FastCursorRecyclerViewAdapter.java | 4 +- .../securesms/database/GroupDatabase.java | 4 +- .../database/GroupReceiptDatabase.java | 2 +- .../securesms/database/IdentityDatabase.java | 4 +- .../securesms/database/JobDatabase.java | 2 +- .../securesms/database/MediaDatabase.java | 4 +- .../securesms/database/MmsDatabase.java | 4 +- .../securesms/database/MmsSmsDatabase.java | 4 +- .../securesms/database/ObservableContent.java | 2 +- .../database/OneTimePreKeyDatabase.java | 2 +- .../securesms/database/PushDatabase.java | 2 +- .../securesms/database/RecipientDatabase.java | 4 +- .../securesms/database/SearchDatabase.java | 2 +- .../securesms/database/SessionDatabase.java | 4 +- .../database/SignedPreKeyDatabase.java | 4 +- .../securesms/database/SmsDatabase.java | 2 +- .../securesms/database/SmsMigrator.java | 2 +- .../securesms/database/StickerDatabase.java | 4 +- .../securesms/database/ThreadDatabase.java | 4 +- .../database/helpers/ClassicOpenHelper.java | 3 +- .../helpers/PreKeyMigrationHelper.java | 2 +- .../helpers/SQLCipherMigrationHelper.java | 4 +- .../database/helpers/SQLCipherOpenHelper.java | 2 +- .../loaders/BucketedThreadMediaLoader.java | 5 +-- .../database/loaders/CountryListLoader.java | 2 +- .../database/loaders/DeviceListLoader.java | 2 +- .../database/loaders/PagingMediaLoader.java | 6 +-- .../database/loaders/RecentPhotosLoader.java | 2 +- .../database/loaders/ThreadMediaLoader.java | 2 +- .../database/model/DisplayRecord.java | 2 +- .../database/model/IncomingSticker.java | 2 +- .../database/model/MediaMmsMessageRecord.java | 4 +- .../database/model/MessageRecord.java | 2 +- .../database/model/MmsMessageRecord.java | 5 +-- .../model/NotificationMmsMessageRecord.java | 2 +- .../securesms/database/model/Quote.java | 4 +- .../database/model/SmsMessageRecord.java | 2 +- .../securesms/database/model/Sticker.java | 2 +- .../database/model/StickerPackRecord.java | 2 +- .../database/model/StickerRecord.java | 2 +- .../database/model/ThreadRecord.java | 4 +- .../securesms/events/PartProgressEvent.java | 2 +- .../securesms/events/RedPhoneEvent.java | 4 +- .../securesms/events/WebRtcViewModel.java | 4 +- .../securesms/giph/model/ChunkedImageUrl.java | 2 +- .../securesms/giph/net/GiphyGifLoader.java | 4 +- .../securesms/giph/net/GiphyLoader.java | 4 +- .../giph/net/GiphyStickerLoader.java | 4 +- .../giph/ui/AspectRatioImageView.java | 2 +- .../securesms/giph/ui/GiphyActivity.java | 14 +++---- .../giph/ui/GiphyActivityToolbar.java | 6 +-- .../securesms/giph/ui/GiphyAdapter.java | 6 +-- .../securesms/giph/ui/GiphyFragment.java | 18 ++++---- .../securesms/giph/ui/GiphyGifFragment.java | 4 +- .../giph/ui/GiphyStickerFragment.java | 4 +- .../giph/util/InfiniteScrollListener.java | 4 +- .../giph/util/RecyclerViewPositionHelper.java | 4 +- .../glide/ChunkedImageUrlFetcher.java | 2 +- .../glide/ChunkedImageUrlLoader.java | 4 +- .../securesms/glide/ContactPhotoFetcher.java | 2 +- .../securesms/glide/ContactPhotoLoader.java | 4 +- .../securesms/glide/OkHttpStreamFetcher.java | 2 +- .../securesms/glide/OkHttpUrlLoader.java | 4 +- .../glide/PaddedHeadersInterceptor.java | 2 +- .../cache/EncryptedBitmapCacheDecoder.java | 4 +- .../cache/EncryptedBitmapResourceEncoder.java | 2 +- .../glide/cache/EncryptedCacheEncoder.java | 2 +- .../securesms/glide/cache/EncryptedCoder.java | 2 +- .../glide/cache/EncryptedGifCacheDecoder.java | 4 +- .../EncryptedGifDrawableResourceEncoder.java | 2 +- .../securesms/groups/GroupManager.java | 4 +- .../groups/GroupMessageProcessor.java | 4 +- .../securesms/imageeditor/Bounds.java | 4 +- .../securesms/imageeditor/CanvasMatrix.java | 2 +- .../imageeditor/ColorableRenderer.java | 2 +- .../securesms/imageeditor/DrawingSession.java | 2 +- .../securesms/imageeditor/EditSession.java | 2 +- .../imageeditor/ElementDragEditSession.java | 2 +- .../imageeditor/ElementEditSession.java | 2 +- .../imageeditor/ElementScaleEditSession.java | 2 +- .../securesms/imageeditor/HiddenEditText.java | 4 +- .../imageeditor/ImageEditorView.java | 8 ++-- .../securesms/imageeditor/Renderer.java | 2 +- .../imageeditor/RendererContext.java | 4 +- .../imageeditor/ThumbDragEditSession.java | 4 +- .../imageeditor/model/AlphaAnimation.java | 2 +- .../imageeditor/model/AnimationMatrix.java | 4 +- .../securesms/imageeditor/model/Bisect.java | 4 +- .../imageeditor/model/CropThumbRenderer.java | 2 +- .../imageeditor/model/EditorElement.java | 4 +- .../model/EditorElementHierarchy.java | 4 +- .../imageeditor/model/EditorFlags.java | 2 +- .../imageeditor/model/EditorModel.java | 6 +-- .../imageeditor/model/ElementStack.java | 4 +- .../imageeditor/model/InBoundsMemory.java | 4 +- .../imageeditor/model/ParcelUtils.java | 2 +- .../imageeditor/model/UndoRedoStacks.java | 4 +- .../AutomaticControlPointBezierLine.java | 4 +- .../renderers/BezierDrawingRenderer.java | 4 +- .../renderers/CropAreaRenderer.java | 6 +-- .../renderers/InvalidateableRenderer.java | 2 +- .../renderers/InverseFillRenderer.java | 4 +- .../imageeditor/renderers/TextRenderer.java | 6 +-- .../jobmanager/AlarmManagerScheduler.java | 2 +- .../jobmanager/CompositeScheduler.java | 2 +- .../securesms/jobmanager/Constraint.java | 4 +- .../jobmanager/ConstraintInstantiator.java | 2 +- .../jobmanager/ConstraintObserver.java | 2 +- .../securesms/jobmanager/Data.java | 4 +- .../securesms/jobmanager/ExecutorFactory.java | 2 +- .../securesms/jobmanager/InAppScheduler.java | 2 +- .../securesms/jobmanager/Job.java | 6 +-- .../securesms/jobmanager/JobController.java | 6 +-- .../securesms/jobmanager/JobInstantiator.java | 2 +- .../securesms/jobmanager/JobLogger.java | 2 +- .../securesms/jobmanager/JobManager.java | 2 +- .../securesms/jobmanager/JobRunner.java | 2 +- .../jobmanager/JobSchedulerScheduler.java | 4 +- .../jobmanager/KeepAliveService.java | 2 +- .../securesms/jobmanager/Scheduler.java | 2 +- .../impl/CellServiceConstraint.java | 2 +- .../impl/CellServiceConstraintObserver.java | 2 +- .../impl/DefaultExecutorFactory.java | 2 +- .../jobmanager/impl/JsonDataSerializer.java | 2 +- .../jobmanager/impl/NetworkConstraint.java | 4 +- .../impl/NetworkConstraintObserver.java | 2 +- .../impl/NetworkOrCellServiceConstraint.java | 2 +- .../impl/SqlCipherMigrationConstraint.java | 2 +- .../SqlCipherMigrationConstraintObserver.java | 2 +- .../jobmanager/migration/DataMigrator.java | 2 +- .../migration/WorkManagerDatabase.java | 4 +- .../migration/WorkManagerFactoryMappings.java | 4 +- .../migration/WorkManagerMigrator.java | 4 +- .../persistence/ConstraintSpec.java | 2 +- .../persistence/DependencySpec.java | 2 +- .../jobmanager/persistence/FullSpec.java | 2 +- .../jobmanager/persistence/JobSpec.java | 4 +- .../jobmanager/persistence/JobStorage.java | 6 +-- .../securesms/jobs/AttachmentDownloadJob.java | 5 +-- .../securesms/jobs/AttachmentUploadJob.java | 2 +- .../securesms/jobs/AvatarDownloadJob.java | 3 +- .../thoughtcrime/securesms/jobs/BaseJob.java | 2 +- .../securesms/jobs/CleanPreKeysJob.java | 2 +- .../securesms/jobs/CreateSignedPreKeyJob.java | 2 +- .../securesms/jobs/FastJobStorage.java | 4 +- .../securesms/jobs/JobManagerFactories.java | 2 +- .../securesms/jobs/LocalBackupJob.java | 2 +- .../securesms/jobs/MmsDownloadJob.java | 4 +- .../securesms/jobs/MmsReceiveJob.java | 2 +- .../securesms/jobs/MmsSendJob.java | 3 +- .../jobs/MultiDeviceBlockedUpdateJob.java | 2 +- .../MultiDeviceConfigurationUpdateJob.java | 2 +- .../jobs/MultiDeviceContactUpdateJob.java | 4 +- .../jobs/MultiDeviceGroupUpdateJob.java | 4 +- .../jobs/MultiDeviceProfileKeyUpdateJob.java | 2 +- .../jobs/MultiDeviceReadUpdateJob.java | 2 +- .../MultiDeviceStickerPackOperationJob.java | 2 +- .../jobs/MultiDeviceStickerPackSyncJob.java | 2 +- .../jobs/MultiDeviceVerifiedUpdateJob.java | 2 +- .../securesms/jobs/PushContentReceiveJob.java | 2 +- .../securesms/jobs/PushDecryptJob.java | 8 ++-- .../securesms/jobs/PushGroupSendJob.java | 6 +-- .../securesms/jobs/PushGroupUpdateJob.java | 2 +- .../securesms/jobs/PushMediaSendJob.java | 4 +- .../jobs/PushNotificationReceiveJob.java | 2 +- .../securesms/jobs/PushReceivedJob.java | 2 +- .../securesms/jobs/PushSendJob.java | 5 +-- .../securesms/jobs/PushTextSendJob.java | 2 +- .../securesms/jobs/RefreshAttributesJob.java | 2 +- .../securesms/jobs/RefreshPreKeysJob.java | 2 +- ...RefreshUnidentifiedDeliveryAbilityJob.java | 2 +- .../securesms/jobs/RequestGroupInfoJob.java | 2 +- .../jobs/RetrieveProfileAvatarJob.java | 2 +- .../securesms/jobs/RetrieveProfileJob.java | 2 +- .../securesms/jobs/RotateCertificateJob.java | 2 +- .../securesms/jobs/RotateProfileKeyJob.java | 4 +- .../securesms/jobs/RotateSignedPreKeyJob.java | 2 +- .../jobs/SendDeliveryReceiptJob.java | 2 +- .../thoughtcrime/securesms/jobs/SendJob.java | 4 +- .../securesms/jobs/SendReadReceiptJob.java | 2 +- .../jobs/ServiceOutageDetectionJob.java | 2 +- .../securesms/jobs/SmsReceiveJob.java | 5 +-- .../securesms/jobs/SmsSendJob.java | 3 +- .../securesms/jobs/SmsSentJob.java | 3 +- .../securesms/jobs/StickerDownloadJob.java | 2 +- .../jobs/StickerPackDownloadJob.java | 2 +- .../securesms/jobs/TrimThreadJob.java | 2 +- .../securesms/jobs/TypingSendJob.java | 2 +- .../securesms/jobs/UpdateApkJob.java | 4 +- .../securesms/linkpreview/LinkPreview.java | 4 +- .../linkpreview/LinkPreviewRepository.java | 2 +- .../linkpreview/LinkPreviewUtil.java | 4 +- .../linkpreview/LinkPreviewViewModel.java | 10 ++--- .../lock/RegistrationLockDialog.java | 4 +- .../lock/RegistrationLockReminders.java | 2 +- .../thoughtcrime/securesms/logging/Log.java | 2 +- .../securesms/logging/LogFile.java | 4 +- .../securesms/logging/LogSecretProvider.java | 2 +- .../securesms/logging/PersistentLogger.java | 4 +- .../logging/UncaughtExceptionLogger.java | 2 +- .../logsubmit/ShareIntentListAdapter.java | 2 +- .../logsubmit/SubmitLogFragment.java | 8 ++-- .../activities/CreateClosedGroupActivity.kt | 6 +-- .../activities/CreatePrivateChatActivity.kt | 6 +-- .../activities/EditClosedGroupActivity.kt | 6 +-- .../EditClosedGroupMembersAdapter.kt | 2 +- .../securesms/loki/activities/HomeActivity.kt | 10 ++--- .../securesms/loki/activities/HomeAdapter.kt | 2 +- .../loki/activities/JoinPublicChatActivity.kt | 4 +- .../loki/activities/LinkDeviceActivity.kt | 4 +- .../loki/activities/LinkedDevicesActivity.kt | 8 ++-- .../loki/activities/LinkedDevicesAdapter.kt | 2 +- .../loki/activities/PNModeActivity.kt | 2 +- .../securesms/loki/activities/PathActivity.kt | 2 +- .../loki/activities/QRCodeActivity.kt | 4 +- .../loki/activities/RegisterActivity.kt | 2 +- .../securesms/loki/activities/SeedActivity.kt | 2 +- .../loki/activities/SelectContactsActivity.kt | 6 +-- .../loki/activities/SelectContactsAdapter.kt | 2 +- .../loki/activities/SettingsActivity.kt | 2 +- .../loki/dialogs/ClearAllDataDialog.kt | 4 +- .../ClosedGroupEditingOptionsBottomSheet.kt | 2 +- .../dialogs/ConversationOptionsBottomSheet.kt | 2 +- .../DeviceEditingOptionsBottomSheet.kt | 2 +- .../loki/dialogs/EditDeviceNameDialog.kt | 4 +- .../dialogs/LinkDeviceMasterModeDialog.kt | 4 +- .../loki/dialogs/LinkDeviceSlaveModeDialog.kt | 4 +- .../dialogs/MultiDeviceRemovalBottomSheet.kt | 2 +- .../dialogs/OpenGroupSuggestionBottomSheet.kt | 2 +- .../securesms/loki/dialogs/SeedDialog.kt | 6 +-- .../fragments/ContactSelectionListAdapter.kt | 2 +- .../fragments/ContactSelectionListFragment.kt | 10 ++--- .../loki/fragments/ScanQRCodeFragment.kt | 2 +- .../ScanQRCodePlaceholderFragment.kt | 2 +- .../fragments/ScanQRCodeWrapperFragment.kt | 4 +- .../loki/todo/JazzIdenticonContactPhoto.kt | 2 +- .../loki/utilities/ActivityUtilities.kt | 4 +- .../securesms/loki/utilities/Broadcaster.kt | 2 +- .../loki/utilities/GeneralUtilities.kt | 2 +- .../securesms/loki/utilities/IP2Country.kt | 2 +- .../securesms/loki/utilities/ViewUtilities.kt | 2 +- .../views/NewConversationButtonSetView.kt | 4 +- .../securesms/loki/views/PathStatusView.kt | 2 +- .../loki/views/ProfilePictureView.kt | 2 +- .../longmessage/LongMessageActivity.java | 4 +- .../longmessage/LongMessageRepository.java | 4 +- .../longmessage/LongMessageViewModel.java | 10 ++--- .../mediapreview/MediaPreviewViewModel.java | 10 ++--- .../mediapreview/MediaRailAdapter.java | 7 ++-- .../mediasend/Camera1Controller.java | 2 +- .../securesms/mediasend/Camera1Fragment.java | 10 ++--- .../mediasend/FlipTransformation.java | 2 +- .../securesms/mediasend/Media.java | 2 +- .../securesms/mediasend/MediaFolder.java | 2 +- .../mediasend/MediaPickerFolderAdapter.java | 4 +- .../mediasend/MediaPickerFolderFragment.java | 16 +++---- .../mediasend/MediaPickerItemAdapter.java | 7 +--- .../mediasend/MediaPickerItemFragment.java | 16 +++---- .../securesms/mediasend/MediaRepository.java | 7 ++-- .../mediasend/MediaSendActivity.java | 8 ++-- .../mediasend/MediaSendFragment.java | 18 ++++---- .../MediaSendFragmentPagerAdapter.java | 10 ++--- .../mediasend/MediaSendGifFragment.java | 6 +-- .../mediasend/MediaSendPageFragment.java | 4 +- .../mediasend/MediaSendVideoFragment.java | 6 +-- .../mediasend/MediaSendViewModel.java | 10 ++--- .../securesms/mediasend/OrderEnforcer.java | 4 +- .../securesms/mms/AttachmentManager.java | 4 +- .../mms/AttachmentStreamLocalUriFetcher.java | 2 +- .../mms/AttachmentStreamUriLoader.java | 4 +- .../securesms/mms/AudioSlide.java | 6 +-- .../securesms/mms/CompatMmsConnection.java | 4 +- .../mms/DecryptableStreamUriLoader.java | 4 +- .../securesms/mms/DocumentSlide.java | 4 +- .../thoughtcrime/securesms/mms/GifSlide.java | 2 +- .../securesms/mms/ImageSlide.java | 6 +-- .../mms/IncomingLegacyMmsConnection.java | 4 +- .../mms/IncomingLollipopMmsConnection.java | 4 +- .../securesms/mms/IncomingMmsConnection.java | 4 +- .../securesms/mms/LegacyMmsConnection.java | 4 +- .../securesms/mms/LocationSlide.java | 2 +- .../securesms/mms/MediaConstraints.java | 4 +- .../securesms/mms/MmsConfigManager.java | 4 +- .../thoughtcrime/securesms/mms/MmsSlide.java | 2 +- .../mms/OutgoingGroupMediaMessage.java | 4 +- .../mms/OutgoingLegacyMmsConnection.java | 4 +- .../mms/OutgoingLollipopMmsConnection.java | 4 +- .../securesms/mms/OutgoingMediaMessage.java | 4 +- .../securesms/mms/OutgoingMmsConnection.java | 4 +- .../mms/OutgoingSecureMediaMessage.java | 4 +- .../securesms/mms/PartAuthority.java | 4 +- .../thoughtcrime/securesms/mms/QuoteId.java | 4 +- .../securesms/mms/QuoteModel.java | 2 +- .../securesms/mms/SignalGlideModule.java | 2 +- src/org/thoughtcrime/securesms/mms/Slide.java | 6 +-- .../thoughtcrime/securesms/mms/SlideDeck.java | 4 +- .../securesms/mms/StickerSlide.java | 6 +-- .../thoughtcrime/securesms/mms/TextSlide.java | 4 +- .../securesms/mms/VideoSlide.java | 6 +-- .../securesms/net/CallRequestController.java | 4 +- .../securesms/net/ChunkedDataFetcher.java | 2 +- .../net/CompositeRequestController.java | 2 +- .../net/ContentProxySafetyInterceptor.java | 4 +- .../AbstractNotificationBuilder.java | 6 +-- .../AndroidAutoHeardReceiver.java | 2 +- .../AndroidAutoReplyReceiver.java | 2 +- .../notifications/DefaultMessageNotifier.java | 7 ++-- .../notifications/MarkReadReceiver.java | 4 +- .../notifications/MessageNotifier.java | 2 +- .../MultipleRecipientNotificationBuilder.java | 6 +-- .../notifications/NotificationChannels.java | 6 +-- .../notifications/NotificationItem.java | 6 +-- .../notifications/NotificationState.java | 4 +- .../OptimizedMessageNotifier.java | 2 +- .../PendingMessageNotificationBuilder.java | 2 +- .../notifications/RemoteReplyReceiver.java | 3 +- .../securesms/notifications/ReplyMethod.java | 4 +- .../SingleRecipientNotificationBuilder.java | 12 +++--- .../securesms/permissions/Permissions.java | 10 ++--- .../permissions/PermissionsRequest.java | 2 +- .../permissions/RationaleDialog.java | 4 +- .../AdvancedPreferenceFragment.java | 10 ++--- .../AppProtectionPreferenceFragment.java | 8 ++-- .../AppearancePreferenceFragment.java | 4 +- .../preferences/BlockedContactListItem.java | 2 +- .../preferences/ChatsPreferenceFragment.java | 10 ++--- .../CorrectedPreferenceFragment.java | 18 ++++---- .../ListSummaryPreferenceFragment.java | 4 +- .../preferences/MmsPreferencesActivity.java | 6 +-- .../preferences/MmsPreferencesFragment.java | 2 +- .../NotificationsPreferenceFragment.java | 7 ++-- .../preferences/SmsMmsPreferenceFragment.java | 13 +++--- .../widgets/ColorPickerPreference.java | 8 ++-- ...rPickerPreferenceDialogFragmentCompat.java | 4 +- .../widgets/ContactPreference.java | 4 +- .../widgets/LEDColorListPreference.java | 6 +-- .../widgets/ProfilePreference.java | 6 +-- .../widgets/ProgressPreference.java | 4 +- .../widgets/SignalListPreference.java | 11 ++--- .../preferences/widgets/SignalPreference.java | 4 +- .../securesms/profiles/AvatarHelper.java | 4 +- .../profiles/GroupShareProfileView.java | 12 +++--- .../securesms/profiles/SystemProfileUtil.java | 5 +-- .../securesms/profiles/UnknownSenderView.java | 4 +- .../securesms/providers/BlobProvider.java | 8 ++-- .../DeprecatedPersistentBlobProvider.java | 4 +- .../securesms/providers/MmsBodyProvider.java | 2 +- .../securesms/providers/PartProvider.java | 2 +- .../push/SignalServiceNetworkAccess.java | 2 +- src/org/thoughtcrime/securesms/qr/QrCode.java | 2 +- .../securesms/qr/ScanningThread.java | 4 +- .../securesms/recipients/Recipient.java | 4 +- .../recipients/RecipientProvider.java | 4 +- .../registration/CaptchaActivity.java | 14 +------ .../registration/WelcomeActivity.java | 2 +- .../scribbles/ImageEditorFragment.java | 6 +-- .../securesms/scribbles/ImageEditorHud.java | 8 ++-- .../securesms/scribbles/StickerLoader.java | 2 +- .../scribbles/StickerSelectActivity.java | 14 +++---- .../scribbles/StickerSelectFragment.java | 14 +++---- .../securesms/scribbles/UriGlideRenderer.java | 4 +- .../scribbles/widget/ColorPaletteAdapter.java | 6 +-- .../securesms/search/SearchFragment.java | 12 +++--- .../securesms/search/SearchListAdapter.java | 6 +-- .../securesms/search/SearchRepository.java | 2 +- .../securesms/search/SearchViewModel.java | 14 ++++--- .../securesms/search/model/MessageResult.java | 2 +- .../securesms/search/model/SearchResult.java | 4 +- .../service/ApplicationMigrationService.java | 2 +- .../securesms/service/DirectShareService.java | 4 +- .../service/GenericForegroundService.java | 10 ++--- .../service/IncomingMessageObserver.java | 14 +++---- .../securesms/service/KeyCachingService.java | 7 ++-- .../service/UpdateApkReadyListener.java | 6 +-- .../securesms/service/WebRtcCallService.java | 10 ++--- .../securesms/sms/IncomingTextMessage.java | 4 +- .../securesms/sms/MessageSender.java | 2 +- .../securesms/stickers/BlessedPacks.java | 2 +- .../stickers/StickerKeyboardPageAdapter.java | 8 ++-- .../stickers/StickerKeyboardPageFragment.java | 14 +++---- .../StickerKeyboardPageViewModel.java | 11 +++-- .../stickers/StickerKeyboardProvider.java | 14 +++---- .../stickers/StickerKeyboardRepository.java | 2 +- .../stickers/StickerKeyboardViewModel.java | 10 ++--- .../securesms/stickers/StickerLocator.java | 2 +- .../stickers/StickerManagementActivity.java | 8 ++-- .../stickers/StickerManagementAdapter.java | 6 +-- .../stickers/StickerManagementRepository.java | 2 +- .../stickers/StickerManagementViewModel.java | 10 ++--- .../securesms/stickers/StickerManifest.java | 4 +- .../stickers/StickerPackInstallEvent.java | 2 +- .../stickers/StickerPackPreviewActivity.java | 10 ++--- .../stickers/StickerPackPreviewAdapter.java | 4 +- .../StickerPackPreviewRepository.java | 4 +- .../stickers/StickerPackPreviewViewModel.java | 10 ++--- .../stickers/StickerPreviewPopup.java | 2 +- .../securesms/stickers/StickerRemoteUri.java | 2 +- .../stickers/StickerRemoteUriFetcher.java | 2 +- .../stickers/StickerRemoteUriLoader.java | 4 +- .../stickers/StickerSearchRepository.java | 2 +- .../securesms/stickers/StickerUrl.java | 4 +- .../securesms/util/AbstractCursorLoader.java | 2 +- .../securesms/util/AsyncLoader.java | 2 +- .../securesms/util/AttachmentUtil.java | 6 +-- .../securesms/util/BackupUtil.java | 4 +- .../securesms/util/BitmapUtil.java | 8 ++-- .../securesms/util/CharacterCalculator.java | 2 +- .../securesms/util/CloseableLiveData.java | 4 +- .../securesms/util/CommunicationActions.java | 6 +-- .../securesms/util/DateUtils.java | 2 +- .../thoughtcrime/securesms/util/Dialogs.java | 2 +- .../securesms/util/FileProviderUtil.java | 4 +- .../securesms/util/GroupUtil.java | 6 +-- .../securesms/util/IdentityUtil.java | 7 ++-- .../securesms/util/IntentUtils.java | 2 +- .../securesms/util/ListenableFutureTask.java | 2 +- .../securesms/util/LongClickCopySpan.java | 4 +- .../util/LongClickMovementMethod.java | 2 +- .../securesms/util/MathUtils.java | 2 +- .../securesms/util/MediaUtil.java | 6 +-- .../securesms/util/ObservingLiveData.java | 6 +-- .../securesms/util/PowerManagerCompat.java | 2 +- .../thoughtcrime/securesms/util/ResUtil.java | 10 ++--- .../securesms/util/SaveAttachmentTask.java | 6 +-- .../securesms/util/SearchUtil.java | 5 +-- .../util/SelectedRecipientsAdapter.java | 4 +- .../securesms/util/ServiceUtil.java | 6 +-- .../securesms/util/ShortCodeUtil.java | 2 +- .../securesms/util/SingleLiveEvent.java | 14 +++---- .../securesms/util/SoftHashMap.java | 2 +- .../securesms/util/StableIdGenerator.java | 8 ++-- .../util/StickyHeaderDecoration.java | 10 ++--- .../securesms/util/Stopwatch.java | 2 +- .../securesms/util/StorageUtil.java | 2 +- .../securesms/util/TelephonyUtil.java | 2 +- .../securesms/util/TextSecurePreferences.java | 8 ++-- .../securesms/util/ThemeUtil.java | 8 ++-- src/org/thoughtcrime/securesms/util/Util.java | 4 +- .../securesms/util/VerifySpan.java | 2 +- .../securesms/util/VersionTracker.java | 2 +- .../thoughtcrime/securesms/util/ViewUtil.java | 12 +++--- .../securesms/util/WakeLockUtil.java | 2 +- .../util/concurrent/SignalExecutors.java | 2 +- .../securesms/util/concurrent/SimpleTask.java | 6 +-- .../util/dualsim/SubscriptionInfoCompat.java | 4 +- .../dualsim/SubscriptionManagerCompat.java | 4 +- .../DynamicLanguageActivityHelper.java | 6 +-- .../util/dynamiclanguage/LanguageString.java | 4 +- .../util/dynamiclanguage/LocaleParser.java | 4 +- .../spans/CenterAlignedRelativeSizeSpan.java | 2 +- .../util/task/SnackbarAsyncTask.java | 4 +- .../securesms/util/views/Stub.java | 2 +- .../video/EncryptedMediaDataSource.java | 4 +- .../securesms/video/VideoPlayer.java | 4 +- .../exo/AttachmentDataSourceFactory.java | 4 +- .../securesms/video/exo/PartDataSource.java | 4 +- .../webrtc/CallNotificationBuilder.java | 8 ++-- .../securesms/webrtc/CameraState.java | 2 +- .../webrtc/PeerConnectionWrapper.java | 4 +- .../webrtc/audio/BluetoothStateManager.java | 6 +-- .../webrtc/audio/IncomingRinger.java | 4 +- .../webrtc/audio/OutgoingRinger.java | 2 +- .../webrtc/audio/SignalAudioManager.java | 6 +-- .../CursorRecyclerViewAdapterTest.java | 5 +-- .../securesms/jobs/FastJobStorageTest.java | 2 +- .../securesms/testutil/DirectExecutor.java | 2 +- 763 files changed, 1733 insertions(+), 1848 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 98df604a46..5a95de62c6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -589,7 +589,7 @@ android:exported="false" android:grantUriPermissions="true" /> diff --git a/build.gradle b/build.gradle index 8ddf482a8e..c1b4cc7025 100644 --- a/build.gradle +++ b/build.gradle @@ -77,21 +77,19 @@ configurations.all { } dependencies { - def supportVersion = '28.0.0' - - implementation "com.android.support:appcompat-v7:$supportVersion" - implementation "com.android.support:recyclerview-v7:$supportVersion" - implementation "com.android.support:design:$supportVersion" - implementation "com.android.support:support-v13:$supportVersion" - implementation "com.android.support:cardview-v7:$supportVersion" - implementation "com.android.support:preference-v7:$supportVersion" - implementation "com.android.support:preference-v14:$supportVersion" - implementation "com.android.support:gridlayout-v7:$supportVersion" - implementation "com.android.support:exifinterface:$supportVersion" - implementation 'com.android.support.constraint:constraint-layout:1.1.3' - implementation 'com.android.support:multidex:1.0.3' - implementation 'android.arch.lifecycle:extensions:1.1.1' - implementation 'android.arch.lifecycle:common-java8:1.1.1' + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.legacy:legacy-support-v13:1.0.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.preference:preference:1.0.0' + implementation 'androidx.legacy:legacy-preference-v14:1.0.0' + implementation 'androidx.gridlayout:gridlayout:1.0.0' + implementation 'androidx.exifinterface:exifinterface:1.0.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.multidex:multidex:2.0.0' + implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' + implementation 'androidx.lifecycle:lifecycle-common-java8:2.0.0' implementation ("com.google.firebase:firebase-messaging:$firebase_messaging_version") { exclude group: 'com.google.firebase', module: 'firebase-core' @@ -112,9 +110,9 @@ dependencies { implementation 'com.jpardogo.materialtabstrip:library:1.0.9' implementation 'org.apache.httpcomponents:httpclient-android:4.3.5' implementation 'com.github.chrisbanes:PhotoView:2.1.3' - implementation 'com.github.bumptech.glide:glide:4.5.0' - annotationProcessor 'com.github.bumptech.glide:compiler:4.5.0' - kapt 'com.github.bumptech.glide:compiler:4.5.0' + implementation 'com.github.bumptech.glide:glide:4.11.0' + annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0' + kapt 'com.github.bumptech.glide:compiler:4.11.0' implementation 'com.makeramen:roundedimageview:2.1.0' implementation 'com.pnikosis:materialish-progress:1.5' implementation 'org.greenrobot:eventbus:3.0.0' @@ -163,8 +161,8 @@ dependencies { testImplementation 'org.powermock:powermock-classloading-xstream:1.6.1' testImplementation 'androidx.test:core:1.1.1-alpha02' - androidTestImplementation 'com.android.support:multidex:1.0.3' - androidTestImplementation 'com.android.support:multidex-instrumentation:1.0.3' + androidTestImplementation 'androidx.multidex:multidex:2.0.0' + androidTestImplementation 'androidx.multidex:multidex-instrumentation:2.0.0' androidTestImplementation 'com.google.dexmaker:dexmaker:1.2' androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2' androidTestImplementation ('org.assertj:assertj-core:1.7.1') { @@ -209,7 +207,7 @@ def abiPostFix = ['armeabi-v7a' : 1, android { flavorDimensions "none" - compileSdkVersion 28 + compileSdkVersion 29 buildToolsVersion '28.0.3' useLibrary 'org.apache.http.legacy' @@ -222,7 +220,7 @@ android { versionName canonicalVersionName minSdkVersion 21 - targetSdkVersion 28 + targetSdkVersion 29 multiDexEnabled true vectorDrawables.useSupportLibrary = true diff --git a/gradle.properties b/gradle.properties index ceddf08f8e..3a9957b944 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,3 @@ +android.useAndroidX=true +android.enableJetifier=true org.gradle.jvmargs=-Xmx2048m \ No newline at end of file diff --git a/res/layout/activity_contact_name_edit.xml b/res/layout/activity_contact_name_edit.xml index feb354872c..42785c8e41 100644 --- a/res/layout/activity_contact_name_edit.xml +++ b/res/layout/activity_contact_name_edit.xml @@ -7,7 +7,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - - diff --git a/res/layout/activity_create_private_chat.xml b/res/layout/activity_create_private_chat.xml index d6bf8f66d7..d0ca41225c 100644 --- a/res/layout/activity_create_private_chat.xml +++ b/res/layout/activity_create_private_chat.xml @@ -1,14 +1,14 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/activity_edit_closed_group.xml b/res/layout/activity_edit_closed_group.xml index 90105bc840..1803eae6ee 100644 --- a/res/layout/activity_edit_closed_group.xml +++ b/res/layout/activity_edit_closed_group.xml @@ -129,7 +129,7 @@ android:layout_height="1px" android:background="@color/separator" /> - diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml index 42859403aa..4ca026f3cb 100644 --- a/res/layout/activity_home.xml +++ b/res/layout/activity_home.xml @@ -8,7 +8,7 @@ android:background="@drawable/default_session_background" xmlns:app="http://schemas.android.com/apk/res-auto"> - - + - - - - + - - - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/activity_linked_devices.xml b/res/layout/activity_linked_devices.xml index 9c451c986a..39b467c7fb 100644 --- a/res/layout/activity_linked_devices.xml +++ b/res/layout/activity_linked_devices.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:background="@drawable/default_session_background"> - diff --git a/res/layout/activity_qr_code.xml b/res/layout/activity_qr_code.xml index d6bf8f66d7..d0ca41225c 100644 --- a/res/layout/activity_qr_code.xml +++ b/res/layout/activity_qr_code.xml @@ -1,14 +1,14 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/activity_select_contacts.xml b/res/layout/activity_select_contacts.xml index c319dfe884..df6338b16f 100644 --- a/res/layout/activity_select_contacts.xml +++ b/res/layout/activity_select_contacts.xml @@ -11,7 +11,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - diff --git a/res/layout/activity_settings.xml b/res/layout/activity_settings.xml index 3f41cde6b9..9f94ec8acf 100644 --- a/res/layout/activity_settings.xml +++ b/res/layout/activity_settings.xml @@ -17,7 +17,7 @@ android:orientation="vertical" android:gravity="center_horizontal"> - - + - - - @@ -138,7 +138,7 @@ - - + - + - - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/captcha_activity.xml b/res/layout/captcha_activity.xml index f5fcdb283a..f6661eb64c 100644 --- a/res/layout/captcha_activity.xml +++ b/res/layout/captcha_activity.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/change_passphrase_activity.xml b/res/layout/change_passphrase_activity.xml index ea299256db..4dfe1626f0 100644 --- a/res/layout/change_passphrase_activity.xml +++ b/res/layout/change_passphrase_activity.xml @@ -18,7 +18,7 @@ android:visibility="visible" android:orientation="vertical"> - @@ -30,9 +30,9 @@ android:hint="@string/change_passphrase_activity__old_passphrase" android:singleLine="true"/> - + - @@ -43,9 +43,9 @@ android:hint="@string/change_passphrase_activity__new_passphrase" android:singleLine="true"/> - + - @@ -56,7 +56,7 @@ android:hint="@string/change_passphrase_activity__repeat_new_passphrase" android:singleLine="true" /> - + - - - + diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml index 0d7c2091ce..27156bcaa0 100644 --- a/res/layout/conversation_activity.xml +++ b/res/layout/conversation_activity.xml @@ -7,7 +7,7 @@ android:layout_height="match_parent" android:background="@drawable/default_session_background"> - - + - - - - + - - - + diff --git a/res/layout/conversation_search_nav.xml b/res/layout/conversation_search_nav.xml index 5ce5b5b575..310d7cfeb8 100644 --- a/res/layout/conversation_search_nav.xml +++ b/res/layout/conversation_search_nav.xml @@ -9,7 +9,7 @@ android:background="@color/compose_view_background" android:visibility="gone" tools:visibility="visible" - tools:parentTag="android.support.constraint.ConstraintLayout"> + tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"> - - + \ No newline at end of file diff --git a/res/layout/emoji_grid_layout.xml b/res/layout/emoji_grid_layout.xml index b164e48983..ccbd5c85df 100644 --- a/res/layout/emoji_grid_layout.xml +++ b/res/layout/emoji_grid_layout.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - + \ No newline at end of file diff --git a/res/layout/experience_upgrade_activity.xml b/res/layout/experience_upgrade_activity.xml index 651e2aafed..73c64014dc 100644 --- a/res/layout/experience_upgrade_activity.xml +++ b/res/layout/experience_upgrade_activity.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - diff --git a/res/layout/experience_upgrade_link_previews_fragment.xml b/res/layout/experience_upgrade_link_previews_fragment.xml index 7c1abf0cf7..61c7e466f8 100644 --- a/res/layout/experience_upgrade_link_previews_fragment.xml +++ b/res/layout/experience_upgrade_link_previews_fragment.xml @@ -1,5 +1,5 @@ - - - + diff --git a/res/layout/experience_upgrade_preference_fragment.xml b/res/layout/experience_upgrade_preference_fragment.xml index a70f0e53dc..046e5265b5 100644 --- a/res/layout/experience_upgrade_preference_fragment.xml +++ b/res/layout/experience_upgrade_preference_fragment.xml @@ -50,7 +50,7 @@ android:text="@string/experience_upgrade_preference_fragment__optionally_see_and_share_when_messages_have_been_read" android:textColor="@android:color/white" /> - - - - diff --git a/res/layout/fragment_submit_log.xml b/res/layout/fragment_submit_log.xml index 2ae828dfa0..e7eafcc9ee 100644 --- a/res/layout/fragment_submit_log.xml +++ b/res/layout/fragment_submit_log.xml @@ -43,7 +43,7 @@ android:layout_height="0dp" android:layout_weight="1"> - - - @@ -24,7 +24,7 @@ android:theme="?attr/actionBarStyle" app:layout_scrollFlags="scroll|enterAlways"/> - - + - - + - - - - + \ No newline at end of file diff --git a/res/layout/item_editable_contact.xml b/res/layout/item_editable_contact.xml index 2acb3def16..4745327acb 100644 --- a/res/layout/item_editable_contact.xml +++ b/res/layout/item_editable_contact.xml @@ -39,7 +39,7 @@ android:layout_height="1dp" android:src="@color/grey_400"/> - diff --git a/res/layout/link_preview.xml b/res/layout/link_preview.xml index 56502655bd..09d371485a 100644 --- a/res/layout/link_preview.xml +++ b/res/layout/link_preview.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto"> - - + \ No newline at end of file diff --git a/res/layout/media_keyboard.xml b/res/layout/media_keyboard.xml index 35320d4f46..8203d8f6c7 100644 --- a/res/layout/media_keyboard.xml +++ b/res/layout/media_keyboard.xml @@ -6,7 +6,7 @@ xmlns:tools="http://schemas.android.com/tools" tools:parentTag="org.thoughtcrime.securesms.components.emoji.MediaKeyboard"> - @@ -66,7 +66,7 @@ app:layout_constraintBottom_toBottomOf="@id/media_keyboard_tabs" app:layout_constraintTop_toTopOf="@+id/media_keyboard_tabs" /> - - + \ No newline at end of file diff --git a/res/layout/media_overview_activity.xml b/res/layout/media_overview_activity.xml index 39b69512ab..ab36f3303d 100644 --- a/res/layout/media_overview_activity.xml +++ b/res/layout/media_overview_activity.xml @@ -1,5 +1,5 @@ - - - - + - + diff --git a/res/layout/media_overview_documents_fragment.xml b/res/layout/media_overview_documents_fragment.xml index 529b3d9fe8..d8f5791bd0 100644 --- a/res/layout/media_overview_documents_fragment.xml +++ b/res/layout/media_overview_documents_fragment.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:background="@drawable/default_session_background"> - - - - - - - - - @@ -135,7 +135,7 @@ app:layout_constraintTop_toBottomOf="@+id/name" app:layout_constraintVertical_bias="1.0" /> - + diff --git a/res/layout/prompt_passphrase_activity.xml b/res/layout/prompt_passphrase_activity.xml index 7cec2f521c..fbd937e11f 100644 --- a/res/layout/prompt_passphrase_activity.xml +++ b/res/layout/prompt_passphrase_activity.xml @@ -22,7 +22,7 @@ - - + - - - - - - + - + - + - - + - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/recipient_preference_photo_rail.xml b/res/layout/recipient_preference_photo_rail.xml index e9a45a77c5..afca69033c 100644 --- a/res/layout/recipient_preference_photo_rail.xml +++ b/res/layout/recipient_preference_photo_rail.xml @@ -1,7 +1,7 @@ - - - + diff --git a/res/layout/registration_activity.xml b/res/layout/registration_activity.xml index 044870c405..d630ecb569 100644 --- a/res/layout/registration_activity.xml +++ b/res/layout/registration_activity.xml @@ -187,7 +187,7 @@ - - + - - - + - - - + - - - + - - - + - - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/scribble_select_sticker_activity.xml b/res/layout/scribble_select_sticker_activity.xml index b2e9764504..ceea06cd10 100644 --- a/res/layout/scribble_select_sticker_activity.xml +++ b/res/layout/scribble_select_sticker_activity.xml @@ -5,14 +5,14 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - - - - + - - - - + diff --git a/res/layout/sticker_preview_activity.xml b/res/layout/sticker_preview_activity.xml index cbf165c120..256eac34ee 100644 --- a/res/layout/sticker_preview_activity.xml +++ b/res/layout/sticker_preview_activity.xml @@ -1,11 +1,11 @@ - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/switch_compat_preference.xml b/res/layout/switch_compat_preference.xml index 739a3c23b2..db24334651 100644 --- a/res/layout/switch_compat_preference.xml +++ b/res/layout/switch_compat_preference.xml @@ -1,5 +1,5 @@ - - diff --git a/res/layout/webrtc_call_screen.xml b/res/layout/webrtc_call_screen.xml index 6df042731d..816f04e76d 100644 --- a/res/layout/webrtc_call_screen.xml +++ b/res/layout/webrtc_call_screen.xml @@ -14,7 +14,7 @@ limitations under the License. --> - - - + diff --git a/res/menu/conversation.xml b/res/menu/conversation.xml index 4a7bb30912..256ac59716 100644 --- a/res/menu/conversation.xml +++ b/res/menu/conversation.xml @@ -10,7 +10,7 @@ \ No newline at end of file diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java index 5090774f31..3e4ea39fcb 100644 --- a/src/org/thoughtcrime/securesms/ApplicationContext.java +++ b/src/org/thoughtcrime/securesms/ApplicationContext.java @@ -16,17 +16,17 @@ */ package org.thoughtcrime.securesms; -import android.arch.lifecycle.DefaultLifecycleObserver; -import android.arch.lifecycle.LifecycleOwner; -import android.arch.lifecycle.ProcessLifecycleOwner; +import androidx.lifecycle.DefaultLifecycleObserver; +import androidx.lifecycle.LifecycleOwner; +import androidx.lifecycle.ProcessLifecycleOwner; import android.content.Context; import android.content.Intent; import android.os.AsyncTask; import android.os.Build; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.multidex.MultiDexApplication; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.multidex.MultiDexApplication; import com.google.firebase.iid.FirebaseInstanceId; diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java index fdf751a0f2..4400f061a8 100644 --- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java +++ b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java @@ -29,14 +29,14 @@ import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Build.VERSION; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.content.ContextCompat; -import android.support.v4.graphics.drawable.DrawableCompat; -import android.support.v7.app.AlertDialog; -import android.support.v7.preference.Preference; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; +import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.Preference; import android.util.Log; import android.widget.Toast; diff --git a/src/org/thoughtcrime/securesms/BaseActionBarActivity.java b/src/org/thoughtcrime/securesms/BaseActionBarActivity.java index b0af5f1144..fc6f64b409 100644 --- a/src/org/thoughtcrime/securesms/BaseActionBarActivity.java +++ b/src/org/thoughtcrime/securesms/BaseActionBarActivity.java @@ -11,11 +11,11 @@ import android.graphics.BitmapFactory; import android.os.Build; import android.os.Build.VERSION_CODES; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.ActivityOptionsCompat; -import android.support.v4.content.LocalBroadcastManager; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.core.app.ActivityCompat; +import androidx.core.app.ActivityOptionsCompat; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.appcompat.app.AppCompatActivity; import android.view.KeyEvent; import android.view.View; import android.view.ViewConfiguration; diff --git a/src/org/thoughtcrime/securesms/BaseActivity.java b/src/org/thoughtcrime/securesms/BaseActivity.java index 56d7547ff2..b5800efc9d 100644 --- a/src/org/thoughtcrime/securesms/BaseActivity.java +++ b/src/org/thoughtcrime/securesms/BaseActivity.java @@ -7,8 +7,8 @@ import android.graphics.BitmapFactory; import android.os.Build; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import android.support.annotation.NonNull; -import android.support.v4.app.FragmentActivity; +import androidx.annotation.NonNull; +import androidx.fragment.app.FragmentActivity; import android.view.KeyEvent; import org.thoughtcrime.securesms.util.TextSecurePreferences; diff --git a/src/org/thoughtcrime/securesms/BasicIntroFragment.java b/src/org/thoughtcrime/securesms/BasicIntroFragment.java index 74db43d4a3..25e7a901df 100644 --- a/src/org/thoughtcrime/securesms/BasicIntroFragment.java +++ b/src/org/thoughtcrime/securesms/BasicIntroFragment.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/BindableConversationItem.java b/src/org/thoughtcrime/securesms/BindableConversationItem.java index 459a99be2f..ae11885fd7 100644 --- a/src/org/thoughtcrime/securesms/BindableConversationItem.java +++ b/src/org/thoughtcrime/securesms/BindableConversationItem.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import org.thoughtcrime.securesms.contactshare.Contact; diff --git a/src/org/thoughtcrime/securesms/BindableConversationListItem.java b/src/org/thoughtcrime/securesms/BindableConversationListItem.java index 124ec7b00c..ec3a45cc78 100644 --- a/src/org/thoughtcrime/securesms/BindableConversationListItem.java +++ b/src/org/thoughtcrime/securesms/BindableConversationListItem.java @@ -1,8 +1,7 @@ package org.thoughtcrime.securesms; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; -import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.database.model.ThreadRecord; import org.thoughtcrime.securesms.mms.GlideRequests; diff --git a/src/org/thoughtcrime/securesms/BlockedContactsActivity.java b/src/org/thoughtcrime/securesms/BlockedContactsActivity.java index bd6dc38dfb..5d954f8264 100644 --- a/src/org/thoughtcrime/securesms/BlockedContactsActivity.java +++ b/src/org/thoughtcrime/securesms/BlockedContactsActivity.java @@ -4,12 +4,12 @@ import android.content.Context; import android.content.Intent; import android.database.Cursor; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.ListFragment; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.Loader; -import android.support.v4.widget.CursorAdapter; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.ListFragment; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.cursoradapter.widget.CursorAdapter; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java b/src/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java index 764f7d3336..74bfe7ae71 100644 --- a/src/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java +++ b/src/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms; import android.app.Activity; import android.content.Intent; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import network.loki.messenger.R; diff --git a/src/org/thoughtcrime/securesms/ConfirmIdentityDialog.java b/src/org/thoughtcrime/securesms/ConfirmIdentityDialog.java index 70a04ee4d3..206cd8aa57 100644 --- a/src/org/thoughtcrime/securesms/ConfirmIdentityDialog.java +++ b/src/org/thoughtcrime/securesms/ConfirmIdentityDialog.java @@ -5,7 +5,7 @@ import android.content.Context; import android.content.DialogInterface; import android.database.Cursor; import android.os.AsyncTask; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.text.SpannableString; import android.text.Spanned; import android.text.method.LinkMovementMethod; diff --git a/src/org/thoughtcrime/securesms/ContactSelectionActivity.java b/src/org/thoughtcrime/securesms/ContactSelectionActivity.java index ccf0c98df7..31f079b72a 100644 --- a/src/org/thoughtcrime/securesms/ContactSelectionActivity.java +++ b/src/org/thoughtcrime/securesms/ContactSelectionActivity.java @@ -17,7 +17,7 @@ package org.thoughtcrime.securesms; import android.os.Bundle; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import org.thoughtcrime.securesms.components.ContactFilterToolbar; import org.thoughtcrime.securesms.loki.fragments.ContactSelectionListFragment; diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java index 2d9828705d..ad1683004c 100644 --- a/src/org/thoughtcrime/securesms/ConversationListActivity.java +++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java @@ -25,9 +25,9 @@ import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.widget.Toolbar; -import android.support.v7.widget.TooltipCompat; +import androidx.annotation.NonNull; +import androidx.appcompat.widget.Toolbar; +import androidx.appcompat.widget.TooltipCompat; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -53,7 +53,6 @@ import org.thoughtcrime.securesms.loki.utilities.ProfilePictureModifiedEvent; import org.thoughtcrime.securesms.loki.activities.JoinPublicChatActivity; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.notifications.MarkReadReceiver; -import org.thoughtcrime.securesms.notifications.MessageNotifier; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.search.SearchFragment; import org.thoughtcrime.securesms.service.KeyCachingService; diff --git a/src/org/thoughtcrime/securesms/ConversationListAdapter.java b/src/org/thoughtcrime/securesms/ConversationListAdapter.java index 154dd48056..ab86efd223 100644 --- a/src/org/thoughtcrime/securesms/ConversationListAdapter.java +++ b/src/org/thoughtcrime/securesms/ConversationListAdapter.java @@ -18,9 +18,9 @@ package org.thoughtcrime.securesms; import android.content.Context; import android.database.Cursor; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java index 27fb781e5a..e5a72655d4 100644 --- a/src/org/thoughtcrime/securesms/ConversationListFragment.java +++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java @@ -30,18 +30,18 @@ import android.graphics.Paint; import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.Snackbar; -import android.support.v4.app.Fragment; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.Loader; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.view.ActionMode; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.snackbar.Snackbar; +import androidx.fragment.app.Fragment; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.view.ActionMode; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.Menu; @@ -77,7 +77,6 @@ import org.thoughtcrime.securesms.jobs.ServiceOutageDetectionJob; import org.thoughtcrime.securesms.loki.activities.CreatePrivateChatActivity; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.notifications.MarkReadReceiver; -import org.thoughtcrime.securesms.notifications.MessageNotifier; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.ViewUtil; diff --git a/src/org/thoughtcrime/securesms/ConversationListItem.java b/src/org/thoughtcrime/securesms/ConversationListItem.java index 28b2e11254..70423ab6a4 100644 --- a/src/org/thoughtcrime/securesms/ConversationListItem.java +++ b/src/org/thoughtcrime/securesms/ConversationListItem.java @@ -22,8 +22,8 @@ import android.graphics.Typeface; import android.graphics.drawable.RippleDrawable; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.style.StyleSpan; import android.util.AttributeSet; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/ConversationListItemAction.java b/src/org/thoughtcrime/securesms/ConversationListItemAction.java index dd26b708da..b5553e8529 100644 --- a/src/org/thoughtcrime/securesms/ConversationListItemAction.java +++ b/src/org/thoughtcrime/securesms/ConversationListItemAction.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms; import android.annotation.TargetApi; import android.content.Context; import android.os.Build; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.AttributeSet; import android.widget.LinearLayout; import android.widget.TextView; diff --git a/src/org/thoughtcrime/securesms/ConversationListItemInboxZero.java b/src/org/thoughtcrime/securesms/ConversationListItemInboxZero.java index 1aace90b79..c24063b0e5 100644 --- a/src/org/thoughtcrime/securesms/ConversationListItemInboxZero.java +++ b/src/org/thoughtcrime/securesms/ConversationListItemInboxZero.java @@ -3,9 +3,9 @@ package org.thoughtcrime.securesms; import android.content.Context; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; import android.util.AttributeSet; import android.widget.LinearLayout; diff --git a/src/org/thoughtcrime/securesms/CountrySelectionFragment.java b/src/org/thoughtcrime/securesms/CountrySelectionFragment.java index 4b4d7ba239..ac266afd8b 100644 --- a/src/org/thoughtcrime/securesms/CountrySelectionFragment.java +++ b/src/org/thoughtcrime/securesms/CountrySelectionFragment.java @@ -2,10 +2,10 @@ package org.thoughtcrime.securesms; import android.app.Activity; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.ListFragment; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.Loader; +import androidx.annotation.NonNull; +import androidx.fragment.app.ListFragment; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; import android.text.Editable; import android.text.TextWatcher; import android.view.LayoutInflater; diff --git a/src/org/thoughtcrime/securesms/CreateProfileActivity.java b/src/org/thoughtcrime/securesms/CreateProfileActivity.java index e41694bae8..92d631f576 100644 --- a/src/org/thoughtcrime/securesms/CreateProfileActivity.java +++ b/src/org/thoughtcrime/securesms/CreateProfileActivity.java @@ -12,8 +12,8 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.RequiresApi; +import androidx.annotation.NonNull; +import androidx.annotation.RequiresApi; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; diff --git a/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java b/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java index 1e6f34a855..176ca5b84a 100644 --- a/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java +++ b/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java @@ -23,7 +23,7 @@ import android.content.Intent; import android.database.Cursor; import android.os.AsyncTask; import android.os.Bundle; -import android.support.v7.preference.PreferenceManager; +import androidx.preference.PreferenceManager; import android.view.View; import android.widget.ProgressBar; @@ -44,7 +44,6 @@ import org.thoughtcrime.securesms.jobs.PushDecryptJob; import org.thoughtcrime.securesms.jobs.RefreshAttributesJob; import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.GlideApp; -import org.thoughtcrime.securesms.notifications.MessageNotifier; import org.thoughtcrime.securesms.service.KeyCachingService; import org.thoughtcrime.securesms.util.FileUtils; import org.thoughtcrime.securesms.util.TextSecurePreferences; diff --git a/src/org/thoughtcrime/securesms/DeviceActivity.java b/src/org/thoughtcrime/securesms/DeviceActivity.java index a93f1c8ddb..5b68a6b478 100644 --- a/src/org/thoughtcrime/securesms/DeviceActivity.java +++ b/src/org/thoughtcrime/securesms/DeviceActivity.java @@ -8,7 +8,7 @@ import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; import android.os.Vibrator; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.transition.TransitionInflater; import android.view.MenuItem; diff --git a/src/org/thoughtcrime/securesms/DeviceAddFragment.java b/src/org/thoughtcrime/securesms/DeviceAddFragment.java index af18022e91..afd05aecf9 100644 --- a/src/org/thoughtcrime/securesms/DeviceAddFragment.java +++ b/src/org/thoughtcrime/securesms/DeviceAddFragment.java @@ -5,8 +5,8 @@ import android.annotation.TargetApi; import android.content.res.Configuration; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewAnimationUtils; diff --git a/src/org/thoughtcrime/securesms/DeviceLinkFragment.java b/src/org/thoughtcrime/securesms/DeviceLinkFragment.java index f118c92e12..4c7e3eb4fc 100644 --- a/src/org/thoughtcrime/securesms/DeviceLinkFragment.java +++ b/src/org/thoughtcrime/securesms/DeviceLinkFragment.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms; import android.content.res.Configuration; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/DeviceListFragment.java b/src/org/thoughtcrime/securesms/DeviceListFragment.java index b3895b93ae..ea400e0481 100644 --- a/src/org/thoughtcrime/securesms/DeviceListFragment.java +++ b/src/org/thoughtcrime/securesms/DeviceListFragment.java @@ -4,11 +4,11 @@ import android.app.Activity; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.ListFragment; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.Loader; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.fragment.app.ListFragment; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java b/src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java index f5fab2f793..2a1f18c8db 100644 --- a/src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java +++ b/src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms; import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.view.Window; import network.loki.messenger.R; diff --git a/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java b/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java index 648fcf38c8..3001cb23a6 100644 --- a/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java +++ b/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java @@ -7,11 +7,11 @@ import android.content.Context; import android.content.Intent; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.app.NotificationCompat; -import android.support.v4.view.ViewPager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.core.app.NotificationCompat; +import androidx.viewpager.widget.ViewPager; import android.view.View; import com.melnykov.fab.FloatingActionButton; diff --git a/src/org/thoughtcrime/securesms/ExpirationDialog.java b/src/org/thoughtcrime/securesms/ExpirationDialog.java index ed6186d634..7493e5ddc8 100644 --- a/src/org/thoughtcrime/securesms/ExpirationDialog.java +++ b/src/org/thoughtcrime/securesms/ExpirationDialog.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; diff --git a/src/org/thoughtcrime/securesms/GroupCreateActivity.java b/src/org/thoughtcrime/securesms/GroupCreateActivity.java index 7760a07cf1..3aeb4111d7 100644 --- a/src/org/thoughtcrime/securesms/GroupCreateActivity.java +++ b/src/org/thoughtcrime/securesms/GroupCreateActivity.java @@ -23,8 +23,8 @@ import android.graphics.Bitmap; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.view.Menu; import android.view.MenuInflater; diff --git a/src/org/thoughtcrime/securesms/GroupMembersDialog.java b/src/org/thoughtcrime/securesms/GroupMembersDialog.java index 4f43c727ae..20948a6196 100644 --- a/src/org/thoughtcrime/securesms/GroupMembersDialog.java +++ b/src/org/thoughtcrime/securesms/GroupMembersDialog.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms; import android.content.Context; import android.content.DialogInterface; import android.os.AsyncTask; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import android.text.TextUtils; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/src/org/thoughtcrime/securesms/IntroPagerAdapter.java b/src/org/thoughtcrime/securesms/IntroPagerAdapter.java index e10cc8fb40..a176c28bbc 100644 --- a/src/org/thoughtcrime/securesms/IntroPagerAdapter.java +++ b/src/org/thoughtcrime/securesms/IntroPagerAdapter.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; import java.util.List; diff --git a/src/org/thoughtcrime/securesms/InviteActivity.java b/src/org/thoughtcrime/securesms/InviteActivity.java index cf4bd2fdd8..6d8a4c9b16 100644 --- a/src/org/thoughtcrime/securesms/InviteActivity.java +++ b/src/org/thoughtcrime/securesms/InviteActivity.java @@ -9,9 +9,9 @@ import android.os.AsyncTask; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; import android.os.Bundle; -import android.support.annotation.AnimRes; -import android.support.v4.view.animation.FastOutSlowInInterpolator; -import android.support.v7.app.AlertDialog; +import androidx.annotation.AnimRes; +import androidx.interpolator.view.animation.FastOutSlowInInterpolator; +import androidx.appcompat.app.AlertDialog; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewAnimationUtils; diff --git a/src/org/thoughtcrime/securesms/LinkPreviewsIntroFragment.java b/src/org/thoughtcrime/securesms/LinkPreviewsIntroFragment.java index 972b43edb0..2b813c41e9 100644 --- a/src/org/thoughtcrime/securesms/LinkPreviewsIntroFragment.java +++ b/src/org/thoughtcrime/securesms/LinkPreviewsIntroFragment.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms; import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/LogSubmitActivity.java b/src/org/thoughtcrime/securesms/LogSubmitActivity.java index bb4e1b78a9..a6391f59ed 100644 --- a/src/org/thoughtcrime/securesms/LogSubmitActivity.java +++ b/src/org/thoughtcrime/securesms/LogSubmitActivity.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms; import android.content.ActivityNotFoundException; import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.FragmentTransaction; +import androidx.fragment.app.FragmentTransaction; import android.view.MenuItem; import android.widget.Toast; diff --git a/src/org/thoughtcrime/securesms/MediaDocumentsAdapter.java b/src/org/thoughtcrime/securesms/MediaDocumentsAdapter.java index 95ccc52db5..3af3f8bc49 100644 --- a/src/org/thoughtcrime/securesms/MediaDocumentsAdapter.java +++ b/src/org/thoughtcrime/securesms/MediaDocumentsAdapter.java @@ -5,8 +5,8 @@ import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; import android.database.Cursor; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/MediaGalleryAdapter.java b/src/org/thoughtcrime/securesms/MediaGalleryAdapter.java index b1dea5d419..e9cfee3372 100644 --- a/src/org/thoughtcrime/securesms/MediaGalleryAdapter.java +++ b/src/org/thoughtcrime/securesms/MediaGalleryAdapter.java @@ -17,7 +17,7 @@ package org.thoughtcrime.securesms; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/MediaOverviewActivity.java b/src/org/thoughtcrime/securesms/MediaOverviewActivity.java index 5c54fd58cf..7a82d64a42 100644 --- a/src/org/thoughtcrime/securesms/MediaOverviewActivity.java +++ b/src/org/thoughtcrime/securesms/MediaOverviewActivity.java @@ -25,21 +25,21 @@ import android.content.res.Resources; import android.database.Cursor; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.Loader; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.view.ActionMode; -import android.support.v7.widget.DividerItemDecoration; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.view.ActionMode; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; diff --git a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java index 79f697d26f..4e01e84d7a 100644 --- a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java +++ b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java @@ -19,7 +19,7 @@ package org.thoughtcrime.securesms; import android.Manifest; import android.annotation.SuppressLint; import android.annotation.TargetApi; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.content.Context; import android.content.Intent; import android.database.Cursor; @@ -28,16 +28,16 @@ import android.os.AsyncTask; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.Loader; -import android.support.v4.util.Pair; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.core.util.Pair; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.AlertDialog; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.GestureDetector; import android.view.LayoutInflater; import android.view.Menu; diff --git a/src/org/thoughtcrime/securesms/MessageDetailsActivity.java b/src/org/thoughtcrime/securesms/MessageDetailsActivity.java index 818a3d6669..3803398f93 100644 --- a/src/org/thoughtcrime/securesms/MessageDetailsActivity.java +++ b/src/org/thoughtcrime/securesms/MessageDetailsActivity.java @@ -24,10 +24,10 @@ import android.database.Cursor; import android.graphics.drawable.ColorDrawable; import android.os.AsyncTask; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.LoaderManager.LoaderCallbacks; -import android.support.v4.content.Loader; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.loader.app.LoaderManager.LoaderCallbacks; +import androidx.loader.content.Loader; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -50,7 +50,6 @@ import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.loki.database.LokiMessageDatabase; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.mms.GlideRequests; -import org.thoughtcrime.securesms.notifications.MessageNotifier; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientModifiedListener; import org.thoughtcrime.securesms.sms.MessageSender; diff --git a/src/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java b/src/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java index b4df7f5c49..0313011026 100644 --- a/src/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java +++ b/src/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/MuteDialog.java b/src/org/thoughtcrime/securesms/MuteDialog.java index ee916986da..33aace5123 100644 --- a/src/org/thoughtcrime/securesms/MuteDialog.java +++ b/src/org/thoughtcrime/securesms/MuteDialog.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms; import android.content.Context; import android.content.DialogInterface; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; import java.util.concurrent.TimeUnit; diff --git a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java index 16046287d9..f4e881c057 100644 --- a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java +++ b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java @@ -23,9 +23,9 @@ import android.content.Intent; import android.graphics.PorterDuff; import android.os.Build; import android.os.Bundle; -import android.support.v4.hardware.fingerprint.FingerprintManagerCompat; -import android.support.v4.os.CancellationSignal; -import android.support.v7.widget.Toolbar; +import androidx.core.hardware.fingerprint.FingerprintManagerCompat; +import androidx.core.os.CancellationSignal; +import androidx.appcompat.widget.Toolbar; import android.text.Editable; import android.text.InputType; import android.text.SpannableString; diff --git a/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java b/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java index b3e4691e78..9d18cdd15a 100644 --- a/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java +++ b/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java @@ -5,10 +5,10 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import org.thoughtcrime.securesms.crypto.MasterSecretUtil; import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob; diff --git a/src/org/thoughtcrime/securesms/ReadReceiptsIntroFragment.java b/src/org/thoughtcrime/securesms/ReadReceiptsIntroFragment.java index 135c0c6d96..32ef878be3 100644 --- a/src/org/thoughtcrime/securesms/ReadReceiptsIntroFragment.java +++ b/src/org/thoughtcrime/securesms/ReadReceiptsIntroFragment.java @@ -2,9 +2,9 @@ package org.thoughtcrime.securesms; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v7.widget.SwitchCompat; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.appcompat.widget.SwitchCompat; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java index 9303347f14..3604d40651 100644 --- a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java +++ b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java @@ -13,19 +13,19 @@ import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; import android.provider.Settings; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.CollapsingToolbarLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.Loader; -import android.support.v4.view.ViewCompat; -import android.support.v7.app.AlertDialog; -import android.support.v7.preference.CheckBoxPreference; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.appbar.CollapsingToolbarLayout; +import androidx.fragment.app.Fragment; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.core.view.ViewCompat; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.CheckBoxPreference; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.appcompat.widget.Toolbar; import android.telephony.PhoneNumberUtils; import android.util.Pair; import android.view.MenuItem; diff --git a/src/org/thoughtcrime/securesms/RegistrationActivity.java b/src/org/thoughtcrime/securesms/RegistrationActivity.java index 26395e4fcd..29ca7d34d9 100644 --- a/src/org/thoughtcrime/securesms/RegistrationActivity.java +++ b/src/org/thoughtcrime/securesms/RegistrationActivity.java @@ -7,9 +7,9 @@ import android.content.Context; import android.content.Intent; import android.os.AsyncTask; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; diff --git a/src/org/thoughtcrime/securesms/ShareActivity.java b/src/org/thoughtcrime/securesms/ShareActivity.java index 6ec7a63992..d242ec42f0 100644 --- a/src/org/thoughtcrime/securesms/ShareActivity.java +++ b/src/org/thoughtcrime/securesms/ShareActivity.java @@ -27,9 +27,9 @@ import android.os.Bundle; import android.os.Parcel; import android.os.Process; import android.provider.OpenableColumns; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.Toolbar; import android.view.MenuItem; import android.view.View; import android.widget.ImageView; diff --git a/src/org/thoughtcrime/securesms/ShortcutLauncherActivity.java b/src/org/thoughtcrime/securesms/ShortcutLauncherActivity.java index 554327f2de..3777ce4f78 100644 --- a/src/org/thoughtcrime/securesms/ShortcutLauncherActivity.java +++ b/src/org/thoughtcrime/securesms/ShortcutLauncherActivity.java @@ -4,10 +4,10 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.TaskStackBuilder; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.TaskStackBuilder; +import androidx.appcompat.app.AppCompatActivity; import android.widget.Toast; import org.thoughtcrime.securesms.database.Address; diff --git a/src/org/thoughtcrime/securesms/SmsSendtoActivity.java b/src/org/thoughtcrime/securesms/SmsSendtoActivity.java index 70f99a663e..de4876cbaa 100644 --- a/src/org/thoughtcrime/securesms/SmsSendtoActivity.java +++ b/src/org/thoughtcrime/securesms/SmsSendtoActivity.java @@ -5,7 +5,7 @@ import android.content.Intent; import android.database.Cursor; import android.os.Bundle; import android.provider.ContactsContract; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.widget.Toast; diff --git a/src/org/thoughtcrime/securesms/TransportOption.java b/src/org/thoughtcrime/securesms/TransportOption.java index 8edd4af97c..c361a42168 100644 --- a/src/org/thoughtcrime/securesms/TransportOption.java +++ b/src/org/thoughtcrime/securesms/TransportOption.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; import android.text.TextUtils; import org.thoughtcrime.securesms.util.CharacterCalculator; diff --git a/src/org/thoughtcrime/securesms/TransportOptions.java b/src/org/thoughtcrime/securesms/TransportOptions.java index 00ed7f42d3..52b37ff25c 100644 --- a/src/org/thoughtcrime/securesms/TransportOptions.java +++ b/src/org/thoughtcrime/securesms/TransportOptions.java @@ -2,14 +2,12 @@ package org.thoughtcrime.securesms; import android.Manifest; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.permissions.Permissions; import org.thoughtcrime.securesms.util.CharacterCalculator; -import org.thoughtcrime.securesms.util.MmsCharacterCalculator; import org.thoughtcrime.securesms.util.PushCharacterCalculator; -import org.thoughtcrime.securesms.util.SmsCharacterCalculator; import org.thoughtcrime.securesms.util.dualsim.SubscriptionInfoCompat; import org.thoughtcrime.securesms.util.dualsim.SubscriptionManagerCompat; import org.whispersystems.libsignal.util.guava.Optional; diff --git a/src/org/thoughtcrime/securesms/TransportOptionsAdapter.java b/src/org/thoughtcrime/securesms/TransportOptionsAdapter.java index c62154285c..703b379915 100644 --- a/src/org/thoughtcrime/securesms/TransportOptionsAdapter.java +++ b/src/org/thoughtcrime/securesms/TransportOptionsAdapter.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms; import android.content.Context; import android.graphics.PorterDuff.Mode; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/TransportOptionsPopup.java b/src/org/thoughtcrime/securesms/TransportOptionsPopup.java index 6addad53b1..411fe7b0e7 100644 --- a/src/org/thoughtcrime/securesms/TransportOptionsPopup.java +++ b/src/org/thoughtcrime/securesms/TransportOptionsPopup.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v7.widget.ListPopupWindow; +import androidx.annotation.NonNull; +import androidx.appcompat.widget.ListPopupWindow; import android.view.View; import android.widget.AdapterView; import android.widget.ListView; diff --git a/src/org/thoughtcrime/securesms/TypingIndicatorIntroFragment.java b/src/org/thoughtcrime/securesms/TypingIndicatorIntroFragment.java index 2ee5027ee4..3ce7a99ff4 100644 --- a/src/org/thoughtcrime/securesms/TypingIndicatorIntroFragment.java +++ b/src/org/thoughtcrime/securesms/TypingIndicatorIntroFragment.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms; import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java index 22162a9179..f78de0ac53 100644 --- a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java +++ b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java @@ -34,12 +34,12 @@ import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; import android.os.Vibrator; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.RequiresApi; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentTransaction; -import android.support.v7.widget.SwitchCompat; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.RequiresApi; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; +import androidx.appcompat.widget.SwitchCompat; import android.text.Html; import android.text.TextUtils; import android.text.method.LinkMovementMethod; diff --git a/src/org/thoughtcrime/securesms/WebRtcCallActivity.java b/src/org/thoughtcrime/securesms/WebRtcCallActivity.java index a689d327b8..311698578c 100644 --- a/src/org/thoughtcrime/securesms/WebRtcCallActivity.java +++ b/src/org/thoughtcrime/securesms/WebRtcCallActivity.java @@ -25,8 +25,8 @@ import android.content.Intent; import android.content.res.Configuration; import android.media.AudioManager; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; import android.view.View; import android.view.Window; import android.view.WindowManager; diff --git a/src/org/thoughtcrime/securesms/attachments/Attachment.java b/src/org/thoughtcrime/securesms/attachments/Attachment.java index e4b056af29..6671f917b8 100644 --- a/src/org/thoughtcrime/securesms/attachments/Attachment.java +++ b/src/org/thoughtcrime/securesms/attachments/Attachment.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.attachments; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.database.AttachmentDatabase; import org.thoughtcrime.securesms.stickers.StickerLocator; diff --git a/src/org/thoughtcrime/securesms/attachments/AttachmentId.java b/src/org/thoughtcrime/securesms/attachments/AttachmentId.java index 89389bb8df..3d43c84195 100644 --- a/src/org/thoughtcrime/securesms/attachments/AttachmentId.java +++ b/src/org/thoughtcrime/securesms/attachments/AttachmentId.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.attachments; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/org/thoughtcrime/securesms/attachments/AttachmentServer.java b/src/org/thoughtcrime/securesms/attachments/AttachmentServer.java index bc68557175..e12ba08c54 100644 --- a/src/org/thoughtcrime/securesms/attachments/AttachmentServer.java +++ b/src/org/thoughtcrime/securesms/attachments/AttachmentServer.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.attachments; import android.content.Context; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.PartAuthority; diff --git a/src/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java b/src/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java index 498bcaf490..afa4d615d0 100644 --- a/src/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java +++ b/src/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.attachments; import android.net.Uri; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.mms.PartAuthority; import org.thoughtcrime.securesms.stickers.StickerLocator; diff --git a/src/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java b/src/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java index 8885849a8f..9eac9138a9 100644 --- a/src/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java +++ b/src/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.attachments; import android.net.Uri; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.database.AttachmentDatabase; import org.thoughtcrime.securesms.database.MmsDatabase; diff --git a/src/org/thoughtcrime/securesms/attachments/PointerAttachment.java b/src/org/thoughtcrime/securesms/attachments/PointerAttachment.java index 43b201767c..0144063fda 100644 --- a/src/org/thoughtcrime/securesms/attachments/PointerAttachment.java +++ b/src/org/thoughtcrime/securesms/attachments/PointerAttachment.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.attachments; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.database.AttachmentDatabase; import org.thoughtcrime.securesms.stickers.StickerLocator; diff --git a/src/org/thoughtcrime/securesms/attachments/UriAttachment.java b/src/org/thoughtcrime/securesms/attachments/UriAttachment.java index c238630bff..2d4a47f207 100644 --- a/src/org/thoughtcrime/securesms/attachments/UriAttachment.java +++ b/src/org/thoughtcrime/securesms/attachments/UriAttachment.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.attachments; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.stickers.StickerLocator; diff --git a/src/org/thoughtcrime/securesms/audio/AudioRecorder.java b/src/org/thoughtcrime/securesms/audio/AudioRecorder.java index 48dc54808a..00fc6da3c7 100644 --- a/src/org/thoughtcrime/securesms/audio/AudioRecorder.java +++ b/src/org/thoughtcrime/securesms/audio/AudioRecorder.java @@ -5,7 +5,7 @@ import android.content.Context; import android.net.Uri; import android.os.Build; import android.os.ParcelFileDescriptor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.logging.Log; import android.util.Pair; diff --git a/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java b/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java index 866cc4a49a..fa65d129e4 100644 --- a/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java +++ b/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java @@ -12,8 +12,8 @@ import android.os.Handler; import android.os.Message; import android.os.PowerManager; import android.os.PowerManager.WakeLock; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.Pair; import android.widget.Toast; diff --git a/src/org/thoughtcrime/securesms/avatar/AvatarSelection.java b/src/org/thoughtcrime/securesms/avatar/AvatarSelection.java index 328cd20c8b..b54c9e6cc4 100644 --- a/src/org/thoughtcrime/securesms/avatar/AvatarSelection.java +++ b/src/org/thoughtcrime/securesms/avatar/AvatarSelection.java @@ -7,9 +7,9 @@ import android.content.Intent; import android.net.Uri; import android.os.Build; import android.provider.MediaStore; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.content.ContextCompat; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.core.content.ContextCompat; import com.theartofdev.edmodo.cropper.CropImage; import com.theartofdev.edmodo.cropper.CropImageView; diff --git a/src/org/thoughtcrime/securesms/backup/BackupDialog.java b/src/org/thoughtcrime/securesms/backup/BackupDialog.java index 1a3e961719..11ca52a688 100644 --- a/src/org/thoughtcrime/securesms/backup/BackupDialog.java +++ b/src/org/thoughtcrime/securesms/backup/BackupDialog.java @@ -4,8 +4,8 @@ package org.thoughtcrime.securesms.backup; import android.content.ClipData; import android.content.ClipboardManager; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; import android.widget.Button; import android.widget.CheckBox; import android.widget.TextView; diff --git a/src/org/thoughtcrime/securesms/backup/BackupPassphrase.java b/src/org/thoughtcrime/securesms/backup/BackupPassphrase.java index 2a96e3a190..0f24f378a0 100644 --- a/src/org/thoughtcrime/securesms/backup/BackupPassphrase.java +++ b/src/org/thoughtcrime/securesms/backup/BackupPassphrase.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.backup; import android.content.Context; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.crypto.KeyStoreHelper; import org.thoughtcrime.securesms.logging.Log; diff --git a/src/org/thoughtcrime/securesms/backup/FullBackupBase.java b/src/org/thoughtcrime/securesms/backup/FullBackupBase.java index 431f60bd9b..c88c4fec21 100644 --- a/src/org/thoughtcrime/securesms/backup/FullBackupBase.java +++ b/src/org/thoughtcrime/securesms/backup/FullBackupBase.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.backup; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.greenrobot.eventbus.EventBus; import org.whispersystems.libsignal.util.ByteUtil; diff --git a/src/org/thoughtcrime/securesms/backup/FullBackupExporter.java b/src/org/thoughtcrime/securesms/backup/FullBackupExporter.java index a706a8fc2c..bd0864f065 100644 --- a/src/org/thoughtcrime/securesms/backup/FullBackupExporter.java +++ b/src/org/thoughtcrime/securesms/backup/FullBackupExporter.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.backup; import android.content.Context; import android.database.Cursor; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.annimon.stream.function.Consumer; diff --git a/src/org/thoughtcrime/securesms/backup/FullBackupImporter.java b/src/org/thoughtcrime/securesms/backup/FullBackupImporter.java index a391638558..96ee5b9f8c 100644 --- a/src/org/thoughtcrime/securesms/backup/FullBackupImporter.java +++ b/src/org/thoughtcrime/securesms/backup/FullBackupImporter.java @@ -6,7 +6,7 @@ import android.content.ContentValues; import android.content.Context; import android.content.SharedPreferences; import android.database.Cursor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Pair; import net.sqlcipher.database.SQLiteDatabase; diff --git a/src/org/thoughtcrime/securesms/color/MaterialColor.java b/src/org/thoughtcrime/securesms/color/MaterialColor.java index 68c4f54502..1832584e9e 100644 --- a/src/org/thoughtcrime/securesms/color/MaterialColor.java +++ b/src/org/thoughtcrime/securesms/color/MaterialColor.java @@ -2,9 +2,9 @@ package org.thoughtcrime.securesms.color; import android.content.Context; import android.graphics.Color; -import android.support.annotation.ColorInt; -import android.support.annotation.ColorRes; -import android.support.annotation.NonNull; +import androidx.annotation.ColorInt; +import androidx.annotation.ColorRes; +import androidx.annotation.NonNull; import network.loki.messenger.R; diff --git a/src/org/thoughtcrime/securesms/color/MaterialColors.java b/src/org/thoughtcrime/securesms/color/MaterialColors.java index 5a0d5bf771..3ebec24104 100644 --- a/src/org/thoughtcrime/securesms/color/MaterialColors.java +++ b/src/org/thoughtcrime/securesms/color/MaterialColors.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.color; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/org/thoughtcrime/securesms/components/AccessibleToggleButton.java b/src/org/thoughtcrime/securesms/components/AccessibleToggleButton.java index 1acc918e96..70c0f73259 100644 --- a/src/org/thoughtcrime/securesms/components/AccessibleToggleButton.java +++ b/src/org/thoughtcrime/securesms/components/AccessibleToggleButton.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.components; import android.content.Context; import android.os.Build; -import android.support.annotation.RequiresApi; +import androidx.annotation.RequiresApi; import android.util.AttributeSet; import android.widget.ToggleButton; diff --git a/src/org/thoughtcrime/securesms/components/AlbumThumbnailView.java b/src/org/thoughtcrime/securesms/components/AlbumThumbnailView.java index 3b79a19dc0..a1b5b71441 100644 --- a/src/org/thoughtcrime/securesms/components/AlbumThumbnailView.java +++ b/src/org/thoughtcrime/securesms/components/AlbumThumbnailView.java @@ -1,10 +1,10 @@ package org.thoughtcrime.securesms.components; import android.content.Context; -import android.support.annotation.ColorInt; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.ColorInt; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.ViewGroup; import android.widget.FrameLayout; diff --git a/src/org/thoughtcrime/securesms/components/AlertView.java b/src/org/thoughtcrime/securesms/components/AlertView.java index a0ff0a2fb0..5c0942bd8a 100644 --- a/src/org/thoughtcrime/securesms/components/AlertView.java +++ b/src/org/thoughtcrime/securesms/components/AlertView.java @@ -4,7 +4,7 @@ import android.annotation.TargetApi; import android.content.Context; import android.content.res.TypedArray; import android.os.Build.VERSION_CODES; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.util.AttributeSet; import android.view.View; import android.widget.ImageView; diff --git a/src/org/thoughtcrime/securesms/components/AnimatingToggle.java b/src/org/thoughtcrime/securesms/components/AnimatingToggle.java index 37dc384f18..d079eba62f 100644 --- a/src/org/thoughtcrime/securesms/components/AnimatingToggle.java +++ b/src/org/thoughtcrime/securesms/components/AnimatingToggle.java @@ -1,9 +1,9 @@ package org.thoughtcrime.securesms.components; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.view.animation.FastOutSlowInInterpolator; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.interpolator.view.animation.FastOutSlowInInterpolator; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java b/src/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java index bdd60ab56a..86dfa8b6ec 100644 --- a/src/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java +++ b/src/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java @@ -8,9 +8,9 @@ import android.content.Context; import android.graphics.drawable.BitmapDrawable; import android.net.Uri; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.LoaderManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.loader.app.LoaderManager; import android.util.Pair; import android.view.Gravity; import android.view.LayoutInflater; diff --git a/src/org/thoughtcrime/securesms/components/AudioView.java b/src/org/thoughtcrime/securesms/components/AudioView.java index cb5ec9513b..9e4c7c3e9a 100644 --- a/src/org/thoughtcrime/securesms/components/AudioView.java +++ b/src/org/thoughtcrime/securesms/components/AudioView.java @@ -8,8 +8,8 @@ import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.drawable.AnimatedVectorDrawable; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/components/AvatarImageView.java b/src/org/thoughtcrime/securesms/components/AvatarImageView.java index 2fba777f0a..375f61a1dc 100644 --- a/src/org/thoughtcrime/securesms/components/AvatarImageView.java +++ b/src/org/thoughtcrime/securesms/components/AvatarImageView.java @@ -8,9 +8,9 @@ import android.graphics.Outline; import android.graphics.Paint; import android.graphics.drawable.Drawable; import android.provider.ContactsContract; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.AppCompatImageView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; import android.view.View; import android.view.ViewOutlineProvider; diff --git a/src/org/thoughtcrime/securesms/components/CircleColorImageView.java b/src/org/thoughtcrime/securesms/components/CircleColorImageView.java index a8a0991152..c9ed937b78 100644 --- a/src/org/thoughtcrime/securesms/components/CircleColorImageView.java +++ b/src/org/thoughtcrime/securesms/components/CircleColorImageView.java @@ -5,7 +5,7 @@ import android.content.res.TypedArray; import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; -import android.support.v7.widget.AppCompatImageView; +import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; import network.loki.messenger.R; diff --git a/src/org/thoughtcrime/securesms/components/ComposeText.java b/src/org/thoughtcrime/securesms/components/ComposeText.java index daaec06406..14353c605c 100644 --- a/src/org/thoughtcrime/securesms/components/ComposeText.java +++ b/src/org/thoughtcrime/securesms/components/ComposeText.java @@ -4,13 +4,13 @@ import android.content.Context; import android.content.res.Configuration; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; -import android.support.v13.view.inputmethod.EditorInfoCompat; -import android.support.v13.view.inputmethod.InputConnectionCompat; -import android.support.v13.view.inputmethod.InputContentInfoCompat; -import android.support.v4.os.BuildCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; +import androidx.core.view.inputmethod.EditorInfoCompat; +import androidx.core.view.inputmethod.InputConnectionCompat; +import androidx.core.view.inputmethod.InputContentInfoCompat; +import androidx.core.os.BuildCompat; import android.text.InputType; import android.text.Spannable; import android.text.SpannableString; diff --git a/src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java b/src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java index 03c9cf24c6..8ae8e555f7 100644 --- a/src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java +++ b/src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.components; import android.content.Context; import android.graphics.Rect; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.widget.Toolbar; import android.text.Editable; import android.text.InputType; import android.text.TextWatcher; diff --git a/src/org/thoughtcrime/securesms/components/ControllableTabLayout.java b/src/org/thoughtcrime/securesms/components/ControllableTabLayout.java index b15530eb36..969945621f 100644 --- a/src/org/thoughtcrime/securesms/components/ControllableTabLayout.java +++ b/src/org/thoughtcrime/securesms/components/ControllableTabLayout.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.components; import android.content.Context; -import android.support.design.widget.TabLayout; +import com.google.android.material.tabs.TabLayout; import android.util.AttributeSet; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/components/ControllableViewPager.java b/src/org/thoughtcrime/securesms/components/ControllableViewPager.java index 9012216f15..9b917fa135 100644 --- a/src/org/thoughtcrime/securesms/components/ControllableViewPager.java +++ b/src/org/thoughtcrime/securesms/components/ControllableViewPager.java @@ -1,9 +1,9 @@ package org.thoughtcrime.securesms.components; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.view.ViewPager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent; diff --git a/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java b/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java index cf30ea76b9..2715d9b773 100644 --- a/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java +++ b/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java @@ -4,8 +4,8 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.res.TypedArray; import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import android.widget.ImageView; diff --git a/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java b/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java index 15c24b1241..4b4e791ab2 100644 --- a/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java +++ b/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java @@ -3,10 +3,10 @@ package org.thoughtcrime.securesms.components; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Canvas; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.UiThread; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.UiThread; import android.util.AttributeSet; import android.widget.FrameLayout; import android.widget.ImageView; diff --git a/src/org/thoughtcrime/securesms/components/ConversationSearchBottomBar.java b/src/org/thoughtcrime/securesms/components/ConversationSearchBottomBar.java index b2177ed1d6..603c4869a1 100644 --- a/src/org/thoughtcrime/securesms/components/ConversationSearchBottomBar.java +++ b/src/org/thoughtcrime/securesms/components/ConversationSearchBottomBar.java @@ -1,9 +1,9 @@ package org.thoughtcrime.securesms.components; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.constraint.ConstraintLayout; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.constraintlayout.widget.ConstraintLayout; import android.util.AttributeSet; import android.view.View; import android.widget.TextView; diff --git a/src/org/thoughtcrime/securesms/components/ConversationTypingView.java b/src/org/thoughtcrime/securesms/components/ConversationTypingView.java index 8c737e51fc..bfa560435f 100644 --- a/src/org/thoughtcrime/securesms/components/ConversationTypingView.java +++ b/src/org/thoughtcrime/securesms/components/ConversationTypingView.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.components; import android.content.Context; import android.graphics.PorterDuff; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import android.widget.LinearLayout; diff --git a/src/org/thoughtcrime/securesms/components/CornerMask.java b/src/org/thoughtcrime/securesms/components/CornerMask.java index ce12259ec9..1abb16ac26 100644 --- a/src/org/thoughtcrime/securesms/components/CornerMask.java +++ b/src/org/thoughtcrime/securesms/components/CornerMask.java @@ -7,8 +7,8 @@ import android.graphics.Path; import android.graphics.PorterDuff; import android.graphics.PorterDuffXfermode; import android.graphics.RectF; -import android.os.Build; -import android.support.annotation.NonNull; + +import androidx.annotation.NonNull; import android.view.View; public class CornerMask { diff --git a/src/org/thoughtcrime/securesms/components/CustomDefaultPreference.java b/src/org/thoughtcrime/securesms/components/CustomDefaultPreference.java index e40b05fde3..fe9877829b 100644 --- a/src/org/thoughtcrime/securesms/components/CustomDefaultPreference.java +++ b/src/org/thoughtcrime/securesms/components/CustomDefaultPreference.java @@ -4,10 +4,10 @@ import android.app.Dialog; import android.content.Context; import android.content.res.TypedArray; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; -import android.support.v7.preference.DialogPreference; -import android.support.v7.preference.PreferenceDialogFragmentCompat; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.DialogPreference; +import androidx.preference.PreferenceDialogFragmentCompat; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; diff --git a/src/org/thoughtcrime/securesms/components/DocumentView.java b/src/org/thoughtcrime/securesms/components/DocumentView.java index 2121a757aa..e991d83a2e 100644 --- a/src/org/thoughtcrime/securesms/components/DocumentView.java +++ b/src/org/thoughtcrime/securesms/components/DocumentView.java @@ -5,9 +5,9 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Color; import android.graphics.PorterDuff; -import android.support.annotation.AttrRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.AttrRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/components/ExpirationTimerView.java b/src/org/thoughtcrime/securesms/components/ExpirationTimerView.java index 8045227a8c..71ba11fba5 100644 --- a/src/org/thoughtcrime/securesms/components/ExpirationTimerView.java +++ b/src/org/thoughtcrime/securesms/components/ExpirationTimerView.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.components; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import network.loki.messenger.R; @@ -11,7 +11,7 @@ import org.thoughtcrime.securesms.util.Util; import java.lang.ref.WeakReference; import java.util.concurrent.TimeUnit; -public class ExpirationTimerView extends android.support.v7.widget.AppCompatImageView { +public class ExpirationTimerView extends androidx.appcompat.widget.AppCompatImageView { private long startedAt; private long expiresIn; diff --git a/src/org/thoughtcrime/securesms/components/FromTextView.java b/src/org/thoughtcrime/securesms/components/FromTextView.java index fbeb943956..d35ee5fa74 100644 --- a/src/org/thoughtcrime/securesms/components/FromTextView.java +++ b/src/org/thoughtcrime/securesms/components/FromTextView.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.components; import android.content.Context; import android.graphics.Typeface; -import android.support.v4.view.ViewCompat; +import androidx.core.view.ViewCompat; import android.text.Spannable; import android.text.SpannableString; import android.text.SpannableStringBuilder; @@ -17,7 +17,6 @@ import network.loki.messenger.R; import org.thoughtcrime.securesms.components.emoji.EmojiTextView; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.ResUtil; -import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.spans.CenterAlignedRelativeSizeSpan; public class FromTextView extends EmojiTextView { diff --git a/src/org/thoughtcrime/securesms/components/GlideBitmapListeningTarget.java b/src/org/thoughtcrime/securesms/components/GlideBitmapListeningTarget.java index 620671dcde..26d70112b6 100644 --- a/src/org/thoughtcrime/securesms/components/GlideBitmapListeningTarget.java +++ b/src/org/thoughtcrime/securesms/components/GlideBitmapListeningTarget.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.components; import android.graphics.Bitmap; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.widget.ImageView; import com.bumptech.glide.request.target.BitmapImageViewTarget; diff --git a/src/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java b/src/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java index e333067940..f6ede07f7e 100644 --- a/src/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java +++ b/src/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.components; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.widget.ImageView; import com.bumptech.glide.request.target.DrawableImageViewTarget; diff --git a/src/org/thoughtcrime/securesms/components/HidingLinearLayout.java b/src/org/thoughtcrime/securesms/components/HidingLinearLayout.java index ded45bb89d..980735aa48 100644 --- a/src/org/thoughtcrime/securesms/components/HidingLinearLayout.java +++ b/src/org/thoughtcrime/securesms/components/HidingLinearLayout.java @@ -3,19 +3,14 @@ package org.thoughtcrime.securesms.components; import android.annotation.TargetApi; import android.content.Context; import android.os.Build; -import android.support.v4.view.animation.FastOutSlowInInterpolator; +import androidx.interpolator.view.animation.FastOutSlowInInterpolator; import android.util.AttributeSet; -import android.view.ViewGroup; import android.view.animation.AlphaAnimation; import android.view.animation.Animation; import android.view.animation.AnimationSet; -import android.view.animation.AnimationUtils; import android.view.animation.ScaleAnimation; -import android.view.animation.TranslateAnimation; import android.widget.LinearLayout; -import network.loki.messenger.R; - public class HidingLinearLayout extends LinearLayout { public HidingLinearLayout(Context context) { diff --git a/src/org/thoughtcrime/securesms/components/ImageDivet.java b/src/org/thoughtcrime/securesms/components/ImageDivet.java index dad179a3e0..0aa1ae2beb 100644 --- a/src/org/thoughtcrime/securesms/components/ImageDivet.java +++ b/src/org/thoughtcrime/securesms/components/ImageDivet.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.drawable.Drawable; -import android.support.v7.widget.AppCompatImageView; +import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; import network.loki.messenger.R; diff --git a/src/org/thoughtcrime/securesms/components/InputAwareLayout.java b/src/org/thoughtcrime/securesms/components/InputAwareLayout.java index 339a18ae9f..126fb5f03c 100644 --- a/src/org/thoughtcrime/securesms/components/InputAwareLayout.java +++ b/src/org/thoughtcrime/securesms/components/InputAwareLayout.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.components; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.widget.EditText; diff --git a/src/org/thoughtcrime/securesms/components/InputPanel.java b/src/org/thoughtcrime/securesms/components/InputPanel.java index 4fb3640dea..6394c8feab 100644 --- a/src/org/thoughtcrime/securesms/components/InputPanel.java +++ b/src/org/thoughtcrime/securesms/components/InputPanel.java @@ -4,13 +4,13 @@ import android.annotation.TargetApi; import android.content.Context; import android.net.Uri; import android.os.Build; -import android.support.annotation.DimenRes; -import android.support.annotation.MainThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.view.ViewCompat; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.DimenRes; +import androidx.annotation.MainThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.view.ViewCompat; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.format.DateUtils; import android.util.AttributeSet; import android.view.KeyEvent; diff --git a/src/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java b/src/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java index a1ffd48121..52618891c9 100644 --- a/src/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java +++ b/src/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java @@ -22,7 +22,7 @@ import android.graphics.Rect; import android.os.Build; import android.os.Build.VERSION_CODES; import android.preference.PreferenceManager; -import android.support.v7.widget.LinearLayoutCompat; +import androidx.appcompat.widget.LinearLayoutCompat; import android.util.AttributeSet; import org.thoughtcrime.securesms.logging.Log; import android.view.Surface; diff --git a/src/org/thoughtcrime/securesms/components/LabeledEditText.java b/src/org/thoughtcrime/securesms/components/LabeledEditText.java index fd7d767e74..11c9fcaf1c 100644 --- a/src/org/thoughtcrime/securesms/components/LabeledEditText.java +++ b/src/org/thoughtcrime/securesms/components/LabeledEditText.java @@ -3,15 +3,13 @@ package org.thoughtcrime.securesms.components; import android.content.Context; import android.content.res.TypedArray; import android.graphics.Color; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.Editable; -import android.text.InputFilter; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; -import android.view.inputmethod.EditorInfo; import android.widget.EditText; import android.widget.FrameLayout; import android.widget.TextView; diff --git a/src/org/thoughtcrime/securesms/components/LinkPreviewView.java b/src/org/thoughtcrime/securesms/components/LinkPreviewView.java index 52c5cc28f4..6453b0cbf9 100644 --- a/src/org/thoughtcrime/securesms/components/LinkPreviewView.java +++ b/src/org/thoughtcrime/securesms/components/LinkPreviewView.java @@ -4,8 +4,8 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Color; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/components/MaxHeightScrollView.java b/src/org/thoughtcrime/securesms/components/MaxHeightScrollView.java index b6b029d91a..744e1a35e5 100644 --- a/src/org/thoughtcrime/securesms/components/MaxHeightScrollView.java +++ b/src/org/thoughtcrime/securesms/components/MaxHeightScrollView.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.components; import android.content.Context; import android.content.res.TypedArray; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.widget.ScrollView; diff --git a/src/org/thoughtcrime/securesms/components/MediaView.java b/src/org/thoughtcrime/securesms/components/MediaView.java index 426e511388..d1ab0a2627 100644 --- a/src/org/thoughtcrime/securesms/components/MediaView.java +++ b/src/org/thoughtcrime/securesms/components/MediaView.java @@ -4,14 +4,13 @@ package org.thoughtcrime.securesms.components; import android.content.Context; import android.net.Uri; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; import android.util.AttributeSet; import android.view.View; import android.view.Window; import android.widget.FrameLayout; -import android.widget.TextView; import network.loki.messenger.R; import org.thoughtcrime.securesms.mms.GlideRequests; diff --git a/src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java b/src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java index 7469cc5254..2eff948224 100644 --- a/src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java +++ b/src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java @@ -3,9 +3,9 @@ package org.thoughtcrime.securesms.components; import android.Manifest; import android.content.Context; import android.graphics.PorterDuff; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.view.ViewCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.view.ViewCompat; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/components/Outliner.java b/src/org/thoughtcrime/securesms/components/Outliner.java index e2c8e71d26..cb6cfc7abf 100644 --- a/src/org/thoughtcrime/securesms/components/Outliner.java +++ b/src/org/thoughtcrime/securesms/components/Outliner.java @@ -1,16 +1,11 @@ package org.thoughtcrime.securesms.components; import android.graphics.Canvas; -import android.graphics.Color; import android.graphics.Paint; import android.graphics.Path; -import android.graphics.PorterDuff; -import android.graphics.PorterDuffXfermode; import android.graphics.RectF; -import android.os.Build; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.view.View; + +import androidx.annotation.ColorInt; public class Outliner { diff --git a/src/org/thoughtcrime/securesms/components/PushRecipientsPanel.java b/src/org/thoughtcrime/securesms/components/PushRecipientsPanel.java index 372a5e6f1b..655fa59083 100644 --- a/src/org/thoughtcrime/securesms/components/PushRecipientsPanel.java +++ b/src/org/thoughtcrime/securesms/components/PushRecipientsPanel.java @@ -17,8 +17,8 @@ package org.thoughtcrime.securesms.components; import android.content.Context; -import android.os.Build; -import android.support.annotation.NonNull; + +import androidx.annotation.NonNull; import android.text.TextUtils; import android.util.AttributeSet; import android.view.LayoutInflater; diff --git a/src/org/thoughtcrime/securesms/components/QuoteView.java b/src/org/thoughtcrime/securesms/components/QuoteView.java index 43c9e8bf7c..2ec6a4579d 100644 --- a/src/org/thoughtcrime/securesms/components/QuoteView.java +++ b/src/org/thoughtcrime/securesms/components/QuoteView.java @@ -6,9 +6,9 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Color; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/components/RatingManager.java b/src/org/thoughtcrime/securesms/components/RatingManager.java index 2e34cee25e..7114f240da 100644 --- a/src/org/thoughtcrime/securesms/components/RatingManager.java +++ b/src/org/thoughtcrime/securesms/components/RatingManager.java @@ -6,7 +6,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; import android.net.Uri; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import org.thoughtcrime.securesms.logging.Log; import android.widget.Toast; diff --git a/src/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java b/src/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java index d1ce480886..4572d01965 100644 --- a/src/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java +++ b/src/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java @@ -5,16 +5,15 @@ import android.annotation.TargetApi; import android.content.Context; import android.database.Cursor; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.provider.MediaStore; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.Loader; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/components/RecyclerViewFastScroller.java b/src/org/thoughtcrime/securesms/components/RecyclerViewFastScroller.java index 05c32624b9..50d9d4d3db 100644 --- a/src/org/thoughtcrime/securesms/components/RecyclerViewFastScroller.java +++ b/src/org/thoughtcrime/securesms/components/RecyclerViewFastScroller.java @@ -24,10 +24,10 @@ import android.animation.ObjectAnimator; import android.annotation.TargetApi; import android.content.Context; import android.os.Build.VERSION; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java b/src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java index d90c18d8e1..aac02118a8 100644 --- a/src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java +++ b/src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.components; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/components/RepeatableImageKey.java b/src/org/thoughtcrime/securesms/components/RepeatableImageKey.java index 5cf63cfe73..39ddf092cb 100644 --- a/src/org/thoughtcrime/securesms/components/RepeatableImageKey.java +++ b/src/org/thoughtcrime/securesms/components/RepeatableImageKey.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.components; import android.content.Context; -import android.support.v7.widget.AppCompatImageButton; +import androidx.appcompat.widget.AppCompatImageButton; import android.util.AttributeSet; import android.view.HapticFeedbackConstants; import android.view.MotionEvent; diff --git a/src/org/thoughtcrime/securesms/components/SearchToolbar.java b/src/org/thoughtcrime/securesms/components/SearchToolbar.java index dfd7229257..e4f9ad41b7 100644 --- a/src/org/thoughtcrime/securesms/components/SearchToolbar.java +++ b/src/org/thoughtcrime/securesms/components/SearchToolbar.java @@ -6,10 +6,6 @@ import android.content.Context; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.os.Build; -import android.support.annotation.MainThread; -import android.support.annotation.Nullable; -import android.support.v7.widget.SearchView; -import android.support.v7.widget.Toolbar; import android.util.AttributeSet; import android.view.MenuItem; import android.view.View; @@ -17,9 +13,15 @@ import android.view.ViewAnimationUtils; import android.widget.EditText; import android.widget.LinearLayout; -import network.loki.messenger.R; +import androidx.annotation.MainThread; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.SearchView; +import androidx.appcompat.widget.Toolbar; + import org.thoughtcrime.securesms.animation.AnimationCompleteListener; +import network.loki.messenger.R; + public class SearchToolbar extends LinearLayout { private float x, y; @@ -56,7 +58,7 @@ public class SearchToolbar extends LinearLayout { this.searchItem = toolbar.getMenu().findItem(R.id.action_filter_search); SearchView searchView = (SearchView) searchItem.getActionView(); - EditText searchText = searchView.findViewById(android.support.v7.appcompat.R.id.search_src_text); + EditText searchText = searchView.findViewById(androidx.appcompat.R.id.search_src_text); searchView.setSubmitButtonEnabled(false); diff --git a/src/org/thoughtcrime/securesms/components/SendButton.java b/src/org/thoughtcrime/securesms/components/SendButton.java index aa37bd7905..ce4488ffd0 100644 --- a/src/org/thoughtcrime/securesms/components/SendButton.java +++ b/src/org/thoughtcrime/securesms/components/SendButton.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.components; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v7.widget.AppCompatImageButton; +import androidx.annotation.NonNull; +import androidx.appcompat.widget.AppCompatImageButton; import android.util.AttributeSet; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/components/SharedContactView.java b/src/org/thoughtcrime/securesms/components/SharedContactView.java index b70603838a..5fea44e4f5 100644 --- a/src/org/thoughtcrime/securesms/components/SharedContactView.java +++ b/src/org/thoughtcrime/securesms/components/SharedContactView.java @@ -6,9 +6,9 @@ import android.graphics.Canvas; import android.graphics.Color; import android.net.Uri; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; import android.util.AttributeSet; import android.view.View; import android.widget.ImageView; diff --git a/src/org/thoughtcrime/securesms/components/SquareImageView.java b/src/org/thoughtcrime/securesms/components/SquareImageView.java index 997349d699..bebf1d88bf 100644 --- a/src/org/thoughtcrime/securesms/components/SquareImageView.java +++ b/src/org/thoughtcrime/securesms/components/SquareImageView.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.components; import android.content.Context; -import android.support.v7.widget.AppCompatImageView; +import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; public class SquareImageView extends AppCompatImageView { diff --git a/src/org/thoughtcrime/securesms/components/StickerView.java b/src/org/thoughtcrime/securesms/components/StickerView.java index ae4813917b..dd3700f494 100644 --- a/src/org/thoughtcrime/securesms/components/StickerView.java +++ b/src/org/thoughtcrime/securesms/components/StickerView.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.components; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import android.widget.FrameLayout; diff --git a/src/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.java b/src/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.java index d31a8ed19f..bdfad8c63a 100644 --- a/src/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.java +++ b/src/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.java @@ -3,10 +3,9 @@ package org.thoughtcrime.securesms.components; import android.annotation.TargetApi; import android.content.Context; import android.os.Build; -import android.support.v7.preference.CheckBoxPreference; -import android.support.v7.preference.Preference; +import androidx.preference.CheckBoxPreference; +import androidx.preference.Preference; import android.util.AttributeSet; -import android.view.View; import network.loki.messenger.R; diff --git a/src/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java b/src/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java index 1be37ab924..f270fca733 100644 --- a/src/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java +++ b/src/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java @@ -3,11 +3,11 @@ package org.thoughtcrime.securesms.components; import android.content.Context; import android.database.Cursor; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/components/ThumbnailView.java b/src/org/thoughtcrime/securesms/components/ThumbnailView.java index f0be76c992..e648fcb0c8 100644 --- a/src/org/thoughtcrime/securesms/components/ThumbnailView.java +++ b/src/org/thoughtcrime/securesms/components/ThumbnailView.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.components; import android.content.Context; import android.content.res.TypedArray; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.UiThread; +import androidx.annotation.NonNull; +import androidx.annotation.UiThread; import android.util.AttributeSet; import org.thoughtcrime.securesms.logging.Log; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/components/TooltipPopup.java b/src/org/thoughtcrime/securesms/components/TooltipPopup.java index a24cb7ca91..d1bca2077c 100644 --- a/src/org/thoughtcrime/securesms/components/TooltipPopup.java +++ b/src/org/thoughtcrime/securesms/components/TooltipPopup.java @@ -3,10 +3,10 @@ package org.thoughtcrime.securesms.components; import android.content.Context; import android.graphics.PorterDuff; import android.os.Build; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/components/TransferControlView.java b/src/org/thoughtcrime/securesms/components/TransferControlView.java index 9d18035308..843ebc9ee7 100644 --- a/src/org/thoughtcrime/securesms/components/TransferControlView.java +++ b/src/org/thoughtcrime/securesms/components/TransferControlView.java @@ -2,9 +2,9 @@ package org.thoughtcrime.securesms.components; import android.animation.LayoutTransition; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import android.util.AttributeSet; import android.view.View; import android.widget.FrameLayout; diff --git a/src/org/thoughtcrime/securesms/components/TypingIndicatorView.java b/src/org/thoughtcrime/securesms/components/TypingIndicatorView.java index 2df2f8d3a3..477776a9dd 100644 --- a/src/org/thoughtcrime/securesms/components/TypingIndicatorView.java +++ b/src/org/thoughtcrime/securesms/components/TypingIndicatorView.java @@ -5,13 +5,12 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.PorterDuff; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import android.widget.LinearLayout; import network.loki.messenger.R; -import org.thoughtcrime.securesms.logging.Log; public class TypingIndicatorView extends LinearLayout { diff --git a/src/org/thoughtcrime/securesms/components/TypingStatusRepository.java b/src/org/thoughtcrime/securesms/components/TypingStatusRepository.java index de34b3511c..96671d7906 100644 --- a/src/org/thoughtcrime/securesms/components/TypingStatusRepository.java +++ b/src/org/thoughtcrime/securesms/components/TypingStatusRepository.java @@ -1,10 +1,10 @@ package org.thoughtcrime.securesms.components; import android.annotation.SuppressLint; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.MutableLiveData; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.annimon.stream.Collectors; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/components/TypingStatusSender.java b/src/org/thoughtcrime/securesms/components/TypingStatusSender.java index 0804d598a5..55fdd513f7 100644 --- a/src/org/thoughtcrime/securesms/components/TypingStatusSender.java +++ b/src/org/thoughtcrime/securesms/components/TypingStatusSender.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.components; import android.annotation.SuppressLint; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.database.Address; diff --git a/src/org/thoughtcrime/securesms/components/ZoomingImageView.java b/src/org/thoughtcrime/securesms/components/ZoomingImageView.java index d1613d3502..da84135a10 100644 --- a/src/org/thoughtcrime/securesms/components/ZoomingImageView.java +++ b/src/org/thoughtcrime/securesms/components/ZoomingImageView.java @@ -4,8 +4,8 @@ import android.annotation.SuppressLint; import android.content.Context; import android.net.Uri; import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import org.thoughtcrime.securesms.logging.Log; import android.util.Pair; diff --git a/src/org/thoughtcrime/securesms/components/camera/CameraUtils.java b/src/org/thoughtcrime/securesms/components/camera/CameraUtils.java index 31c24c52a6..8feaa8fb13 100644 --- a/src/org/thoughtcrime/securesms/components/camera/CameraUtils.java +++ b/src/org/thoughtcrime/securesms/components/camera/CameraUtils.java @@ -5,8 +5,8 @@ import android.hardware.Camera; import android.hardware.Camera.CameraInfo; import android.hardware.Camera.Parameters; import android.hardware.Camera.Size; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.DisplayMetrics; import org.thoughtcrime.securesms.logging.Log; import android.view.Surface; diff --git a/src/org/thoughtcrime/securesms/components/camera/CameraView.java b/src/org/thoughtcrime/securesms/components/camera/CameraView.java index bc2fec49c0..8e99474195 100644 --- a/src/org/thoughtcrime/securesms/components/camera/CameraView.java +++ b/src/org/thoughtcrime/securesms/components/camera/CameraView.java @@ -29,8 +29,8 @@ import android.hardware.Camera.Size; import android.os.AsyncTask; import android.os.Build; import android.os.Build.VERSION; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import org.thoughtcrime.securesms.logging.Log; import android.view.OrientationEventListener; diff --git a/src/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java b/src/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java index a7dec006fc..73c209b14d 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java +++ b/src/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.components.emoji; import android.content.Context; import android.graphics.Canvas; import android.graphics.Paint; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/components/emoji/CompositeEmojiPageModel.java b/src/org/thoughtcrime/securesms/components/emoji/CompositeEmojiPageModel.java index cc4c7156e5..28c4e9f385 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/CompositeEmojiPageModel.java +++ b/src/org/thoughtcrime/securesms/components/emoji/CompositeEmojiPageModel.java @@ -1,13 +1,9 @@ package org.thoughtcrime.securesms.components.emoji; -import android.support.annotation.AttrRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.AttrRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; -import com.annimon.stream.Stream; - -import java.util.ArrayList; -import java.util.Arrays; import java.util.LinkedList; import java.util.List; diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java index e3c4ba9fe5..34dfc06bfc 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java @@ -2,9 +2,9 @@ package org.thoughtcrime.securesms.components.emoji; import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.AppCompatEditText; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.AppCompatEditText; import android.text.InputFilter; import android.util.AttributeSet; diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java index c0f1f90485..67fd6591e0 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java @@ -2,9 +2,9 @@ package org.thoughtcrime.securesms.components.emoji; import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.view.PagerAdapter; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.viewpager.widget.PagerAdapter; import android.view.KeyEvent; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java index 607bdf6084..bbcffb2e13 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java @@ -1,9 +1,9 @@ package org.thoughtcrime.securesms.components.emoji; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java index 8b599e378e..b679054f3f 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.components.emoji; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java index f7c8aef716..c7da539376 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java @@ -11,8 +11,8 @@ import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.Spannable; import android.text.SpannableStringBuilder; import android.widget.TextView; diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiSpan.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiSpan.java index 998e2b9991..90e828cdbd 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiSpan.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiSpan.java @@ -4,7 +4,7 @@ import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Paint.FontMetricsInt; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.widget.TextView; import network.loki.messenger.R; diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java index c786a369a5..ad99f1d065 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java @@ -3,10 +3,10 @@ package org.thoughtcrime.securesms.components.emoji; import android.content.Context; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.widget.TextViewCompat; -import android.support.v7.widget.AppCompatTextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.widget.TextViewCompat; +import androidx.appcompat.widget.AppCompatTextView; import android.text.SpannableStringBuilder; import android.text.TextUtils; import android.util.AttributeSet; diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java index 35d7e7baa9..ad9aead5a7 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java @@ -4,8 +4,8 @@ import android.content.Context; import android.content.res.ColorStateList; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.v7.widget.AppCompatImageButton; +import androidx.annotation.NonNull; +import androidx.appcompat.widget.AppCompatImageButton; import android.util.AttributeSet; import org.thoughtcrime.securesms.stickers.StickerKeyboardProvider; diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java index 06a617d5b8..75dbe2afa3 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.components.emoji; import android.content.Context; import android.os.Build; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.LayoutInflater; import android.view.ViewGroup; import android.widget.ImageView; diff --git a/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java b/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java index ae86d7a79d..7574236349 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java +++ b/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java @@ -1,12 +1,12 @@ package org.thoughtcrime.securesms.components.emoji; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.view.PagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardBottomTabAdapter.java b/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardBottomTabAdapter.java index 66236978aa..2a1b377157 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardBottomTabAdapter.java +++ b/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardBottomTabAdapter.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.components.emoji; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardProvider.java b/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardProvider.java index f324e0cd40..f1537cd202 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardProvider.java +++ b/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardProvider.java @@ -1,9 +1,9 @@ package org.thoughtcrime.securesms.components.emoji; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.view.PagerAdapter; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.viewpager.widget.PagerAdapter; import android.widget.ImageView; import org.thoughtcrime.securesms.mms.GlideRequests; diff --git a/src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java b/src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java index 74a080e4e7..9188fc6622 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java +++ b/src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.os.AsyncTask; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.annimon.stream.Stream; import com.fasterxml.jackson.databind.type.CollectionType; diff --git a/src/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java b/src/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java index 1843b33c94..e1b248b5cc 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java +++ b/src/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.components.emoji; -import android.support.annotation.AttrRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.AttrRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.java b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.java index 28aed06238..387af40a08 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.java +++ b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.components.emoji.parsing; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class EmojiDrawInfo { diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java index a5487f7872..d6848321b5 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java +++ b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java @@ -6,13 +6,10 @@ import android.content.res.AssetManager; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.AsyncTask; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.logging.Log; -import com.bumptech.glide.load.engine.DiskCacheStrategy; - import org.thoughtcrime.securesms.components.emoji.EmojiPageModel; -import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.util.ListenableFutureTask; import org.thoughtcrime.securesms.util.Stopwatch; import org.thoughtcrime.securesms.util.Util; @@ -21,7 +18,6 @@ import java.io.IOException; import java.io.InputStream; import java.lang.ref.SoftReference; import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; public class EmojiPageBitmap { diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java index 7a9bc32a78..b582d7afe1 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java +++ b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java @@ -21,8 +21,8 @@ package org.thoughtcrime.securesms.components.emoji.parsing; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.Iterator; import java.util.LinkedList; diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiTree.java b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiTree.java index cde20d76f8..af8caa568d 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiTree.java +++ b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiTree.java @@ -20,7 +20,7 @@ package org.thoughtcrime.securesms.components.emoji.parsing; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.util.HashMap; import java.util.Map; diff --git a/src/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java b/src/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java index 6cdc6f8a60..ca661915b4 100644 --- a/src/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java +++ b/src/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java @@ -4,8 +4,8 @@ package org.thoughtcrime.securesms.components.identity; import android.content.Context; import android.content.DialogInterface; import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; import network.loki.messenger.R; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/src/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java b/src/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java index 1981b573af..f06cd2c6bd 100644 --- a/src/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java +++ b/src/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java @@ -3,9 +3,9 @@ package org.thoughtcrime.securesms.components.identity; import android.content.Context; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; import android.util.AttributeSet; import org.thoughtcrime.securesms.logging.Log; import android.view.LayoutInflater; diff --git a/src/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java b/src/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java index c42b7e737e..0ab6982f2e 100644 --- a/src/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java +++ b/src/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.components.identity; import android.content.Context; import android.content.DialogInterface; import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; import network.loki.messenger.R; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/src/org/thoughtcrime/securesms/components/location/SignalPlace.java b/src/org/thoughtcrime/securesms/components/location/SignalPlace.java index 0519e8d2c2..1b836a6bf5 100644 --- a/src/org/thoughtcrime/securesms/components/location/SignalPlace.java +++ b/src/org/thoughtcrime/securesms/components/location/SignalPlace.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.components.location; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/org/thoughtcrime/securesms/components/recyclerview/DeleteItemAnimator.java b/src/org/thoughtcrime/securesms/components/recyclerview/DeleteItemAnimator.java index dbf18be384..4fc116565f 100644 --- a/src/org/thoughtcrime/securesms/components/recyclerview/DeleteItemAnimator.java +++ b/src/org/thoughtcrime/securesms/components/recyclerview/DeleteItemAnimator.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.components.recyclerview; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.RecyclerView; public class DeleteItemAnimator extends DefaultItemAnimator { diff --git a/src/org/thoughtcrime/securesms/components/recyclerview/SmoothScrollingLinearLayoutManager.java b/src/org/thoughtcrime/securesms/components/recyclerview/SmoothScrollingLinearLayoutManager.java index 01bebbf9d8..a1b45ac2ae 100644 --- a/src/org/thoughtcrime/securesms/components/recyclerview/SmoothScrollingLinearLayoutManager.java +++ b/src/org/thoughtcrime/securesms/components/recyclerview/SmoothScrollingLinearLayoutManager.java @@ -1,9 +1,9 @@ package org.thoughtcrime.securesms.components.recyclerview; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.LinearSmoothScroller; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.LinearSmoothScroller; import android.util.DisplayMetrics; public class SmoothScrollingLinearLayoutManager extends LinearLayoutManager { diff --git a/src/org/thoughtcrime/securesms/components/registration/CallMeCountDownView.java b/src/org/thoughtcrime/securesms/components/registration/CallMeCountDownView.java index b46cdf0fca..ab574e9670 100644 --- a/src/org/thoughtcrime/securesms/components/registration/CallMeCountDownView.java +++ b/src/org/thoughtcrime/securesms/components/registration/CallMeCountDownView.java @@ -2,21 +2,11 @@ package org.thoughtcrime.securesms.components.registration; import android.content.Context; -import android.graphics.PorterDuff; -import android.graphics.PorterDuffColorFilter; -import android.os.Build; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; import android.util.AttributeSet; -import android.view.View; -import android.widget.Button; -import android.widget.ImageView; -import android.widget.RelativeLayout; -import android.widget.TextView; import network.loki.messenger.R; -public class CallMeCountDownView extends android.support.v7.widget.AppCompatButton { +public class CallMeCountDownView extends androidx.appcompat.widget.AppCompatButton { private int countDown; diff --git a/src/org/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton.java b/src/org/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton.java index 9277f1eb87..df117acd88 100644 --- a/src/org/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton.java +++ b/src/org/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.components.registration; import android.animation.Animator; import android.content.Context; -import android.support.design.widget.FloatingActionButton; +import com.google.android.material.floatingactionbutton.FloatingActionButton; import android.util.AttributeSet; import org.thoughtcrime.securesms.animation.AnimationCompleteListener; diff --git a/src/org/thoughtcrime/securesms/components/registration/VerificationCodeView.java b/src/org/thoughtcrime/securesms/components/registration/VerificationCodeView.java index b9a8a7da50..793c152ba4 100644 --- a/src/org/thoughtcrime/securesms/components/registration/VerificationCodeView.java +++ b/src/org/thoughtcrime/securesms/components/registration/VerificationCodeView.java @@ -5,10 +5,10 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Color; import android.os.Build; -import android.support.annotation.MainThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; +import androidx.annotation.MainThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; import android.util.AttributeSet; import android.util.TypedValue; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/components/registration/VerificationPinKeyboard.java b/src/org/thoughtcrime/securesms/components/registration/VerificationPinKeyboard.java index 1f9297ce14..79e419f03a 100644 --- a/src/org/thoughtcrime/securesms/components/registration/VerificationPinKeyboard.java +++ b/src/org/thoughtcrime/securesms/components/registration/VerificationPinKeyboard.java @@ -6,9 +6,9 @@ import android.graphics.PorterDuff; import android.inputmethodservice.Keyboard; import android.inputmethodservice.KeyboardView; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; import android.util.AttributeSet; import android.view.View; import android.view.animation.Animation; diff --git a/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java b/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java index dc60556b44..bba6b4552f 100644 --- a/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java +++ b/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java @@ -8,8 +8,8 @@ import android.net.Uri; import android.os.Build; import android.os.PowerManager; import android.provider.Settings; -import android.support.annotation.NonNull; -import android.support.annotation.RequiresApi; +import androidx.annotation.NonNull; +import androidx.annotation.RequiresApi; import android.view.View; import network.loki.messenger.R; diff --git a/src/org/thoughtcrime/securesms/components/reminder/InviteReminder.java b/src/org/thoughtcrime/securesms/components/reminder/InviteReminder.java index b00df027f7..d059e6a2f9 100644 --- a/src/org/thoughtcrime/securesms/components/reminder/InviteReminder.java +++ b/src/org/thoughtcrime/securesms/components/reminder/InviteReminder.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.components.reminder; import android.content.Context; import android.os.AsyncTask; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import android.view.View.OnClickListener; diff --git a/src/org/thoughtcrime/securesms/components/reminder/Reminder.java b/src/org/thoughtcrime/securesms/components/reminder/Reminder.java index 9674197f9e..be0c867173 100644 --- a/src/org/thoughtcrime/securesms/components/reminder/Reminder.java +++ b/src/org/thoughtcrime/securesms/components/reminder/Reminder.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.components.reminder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View.OnClickListener; public abstract class Reminder { diff --git a/src/org/thoughtcrime/securesms/components/reminder/ServiceOutageReminder.java b/src/org/thoughtcrime/securesms/components/reminder/ServiceOutageReminder.java index 8a2e5f5eb1..5559caf6f6 100644 --- a/src/org/thoughtcrime/securesms/components/reminder/ServiceOutageReminder.java +++ b/src/org/thoughtcrime/securesms/components/reminder/ServiceOutageReminder.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.components.reminder; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import network.loki.messenger.R; import org.thoughtcrime.securesms.util.TextSecurePreferences; diff --git a/src/org/thoughtcrime/securesms/components/reminder/ShareReminder.java b/src/org/thoughtcrime/securesms/components/reminder/ShareReminder.java index 17ccf64fa9..6439e5bb68 100644 --- a/src/org/thoughtcrime/securesms/components/reminder/ShareReminder.java +++ b/src/org/thoughtcrime/securesms/components/reminder/ShareReminder.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.components.reminder; import android.content.Context; import android.content.Intent; import android.database.Cursor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.View; import android.view.View.OnClickListener; diff --git a/src/org/thoughtcrime/securesms/components/viewpager/ExtendedOnPageChangedListener.java b/src/org/thoughtcrime/securesms/components/viewpager/ExtendedOnPageChangedListener.java index 62d0390102..ae679ddcea 100644 --- a/src/org/thoughtcrime/securesms/components/viewpager/ExtendedOnPageChangedListener.java +++ b/src/org/thoughtcrime/securesms/components/viewpager/ExtendedOnPageChangedListener.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.components.viewpager; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; public abstract class ExtendedOnPageChangedListener implements ViewPager.OnPageChangeListener { diff --git a/src/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java b/src/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java index 5619a57394..7f139f1ba4 100644 --- a/src/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java +++ b/src/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.components.viewpager; import android.content.Context; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import org.thoughtcrime.securesms.logging.Log; import android.view.MotionEvent; diff --git a/src/org/thoughtcrime/securesms/components/webrtc/PercentFrameLayout.java b/src/org/thoughtcrime/securesms/components/webrtc/PercentFrameLayout.java index 9011d07b6a..2a4cca8589 100644 --- a/src/org/thoughtcrime/securesms/components/webrtc/PercentFrameLayout.java +++ b/src/org/thoughtcrime/securesms/components/webrtc/PercentFrameLayout.java @@ -11,21 +11,10 @@ package org.thoughtcrime.securesms.components.webrtc; import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.graphics.PorterDuff; -import android.graphics.PorterDuffXfermode; -import android.graphics.Xfermode; -import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; -import java.util.LinkedList; -import java.util.List; - /** * Simple container that confines the children to a subrectangle specified as percentage values of * the container size. The children are centered horizontally and vertically inside the confined diff --git a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcAnswerDeclineButton.java b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcAnswerDeclineButton.java index 7f18b58e92..de2d4ba53b 100644 --- a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcAnswerDeclineButton.java +++ b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcAnswerDeclineButton.java @@ -8,8 +8,8 @@ import android.animation.ObjectAnimator; import android.content.Context; import android.graphics.Color; import android.os.Build; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallControls.java b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallControls.java index de7abaff1b..31194a6556 100644 --- a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallControls.java +++ b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallControls.java @@ -5,7 +5,7 @@ import android.annotation.TargetApi; import android.content.Context; import android.media.AudioManager; import android.os.Build; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; @@ -20,7 +20,6 @@ import network.loki.messenger.R; import org.thoughtcrime.securesms.components.AccessibleToggleButton; import org.thoughtcrime.securesms.util.ServiceUtil; import org.thoughtcrime.securesms.util.ViewUtil; -import org.thoughtcrime.securesms.webrtc.CameraState; public class WebRtcCallControls extends LinearLayout { diff --git a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java index 7e321efd8f..76006bbd2f 100644 --- a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java +++ b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java @@ -18,10 +18,10 @@ package org.thoughtcrime.securesms.components.webrtc; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.view.ViewCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import androidx.core.view.ViewCompat; import android.text.SpannableString; import android.text.Spanned; import android.text.TextUtils; @@ -42,7 +42,6 @@ import network.loki.messenger.R; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientModifiedListener; -import org.thoughtcrime.securesms.service.WebRtcCallService; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.VerifySpan; import org.thoughtcrime.securesms.util.ViewUtil; diff --git a/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java b/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java index a95cc0330a..a229ca838f 100644 --- a/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java +++ b/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java @@ -16,14 +16,13 @@ */ package org.thoughtcrime.securesms.contacts; -import android.Manifest; import android.content.Context; import android.database.Cursor; import android.database.MatrixCursor; import android.database.MergeCursor; import android.provider.ContactsContract; -import android.support.annotation.NonNull; -import android.support.v4.content.CursorLoader; +import androidx.annotation.NonNull; +import androidx.loader.content.CursorLoader; import android.text.TextUtils; import network.loki.messenger.R; @@ -34,7 +33,6 @@ import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.database.ThreadDatabase; import org.thoughtcrime.securesms.database.model.ThreadRecord; import org.thoughtcrime.securesms.logging.Log; -import org.thoughtcrime.securesms.permissions.Permissions; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.NumberUtil; diff --git a/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java b/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java index aaa50658d9..97812c3325 100644 --- a/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java +++ b/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java @@ -32,8 +32,8 @@ import android.os.RemoteException; import android.provider.BaseColumns; import android.provider.ContactsContract; import android.provider.ContactsContract.RawContacts; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Pair; diff --git a/src/org/thoughtcrime/securesms/contacts/RecipientsEditor.java b/src/org/thoughtcrime/securesms/contacts/RecipientsEditor.java index 7c77dd8948..2f46eff3dc 100644 --- a/src/org/thoughtcrime/securesms/contacts/RecipientsEditor.java +++ b/src/org/thoughtcrime/securesms/contacts/RecipientsEditor.java @@ -18,7 +18,7 @@ package org.thoughtcrime.securesms.contacts; import android.content.Context; -import android.support.v7.widget.AppCompatMultiAutoCompleteTextView; +import androidx.appcompat.widget.AppCompatMultiAutoCompleteTextView; import android.telephony.PhoneNumberUtils; import android.text.Annotation; import android.text.Editable; diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ContactColors.java b/src/org/thoughtcrime/securesms/contacts/avatars/ContactColors.java index 2a115c58ae..63816f62bb 100644 --- a/src/org/thoughtcrime/securesms/contacts/avatars/ContactColors.java +++ b/src/org/thoughtcrime/securesms/contacts/avatars/ContactColors.java @@ -1,9 +1,8 @@ package org.thoughtcrime.securesms.contacts.avatars; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.color.MaterialColor; -import org.thoughtcrime.securesms.color.MaterialColors; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ContactColorsLegacy.java b/src/org/thoughtcrime/securesms/contacts/avatars/ContactColorsLegacy.java index ec99f4d36d..3adb6848f5 100644 --- a/src/org/thoughtcrime/securesms/contacts/avatars/ContactColorsLegacy.java +++ b/src/org/thoughtcrime/securesms/contacts/avatars/ContactColorsLegacy.java @@ -1,9 +1,8 @@ package org.thoughtcrime.securesms.contacts.avatars; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.color.MaterialColor; -import org.thoughtcrime.securesms.color.MaterialColors; /** * Used for migrating legacy colors to modern colors. For normal color generation, use diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/ContactPhoto.java index 3199ae2cc4..fbe53dba88 100644 --- a/src/org/thoughtcrime/securesms/contacts/avatars/ContactPhoto.java +++ b/src/org/thoughtcrime/securesms/contacts/avatars/ContactPhoto.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.contacts.avatars; import android.content.Context; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bumptech.glide.load.Key; diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java index 53f7135576..969a0d8c79 100644 --- a/src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java +++ b/src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java @@ -5,10 +5,10 @@ import android.graphics.Color; import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; -import android.support.annotation.NonNull; -import android.support.annotation.DrawableRes; -import android.support.annotation.Nullable; -import android.support.v7.content.res.AppCompatResources; +import androidx.annotation.NonNull; +import androidx.annotation.DrawableRes; +import androidx.annotation.Nullable; +import androidx.appcompat.content.res.AppCompatResources; import android.text.TextUtils; import com.amulyakhare.textdrawable.TextDrawable; diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java index 249841afa9..7d0baf8a66 100644 --- a/src/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java +++ b/src/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.contacts.avatars; import android.content.Context; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java index 22c3ea398a..02b8731217 100644 --- a/src/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java +++ b/src/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.contacts.avatars; import android.content.Context; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.profiles.AvatarHelper; diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java index c1f5cdfb2f..0f2fff167e 100644 --- a/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java +++ b/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java @@ -5,8 +5,8 @@ import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.graphics.drawable.LayerDrawable; -import android.support.annotation.DrawableRes; -import android.support.v7.content.res.AppCompatResources; +import androidx.annotation.DrawableRes; +import androidx.appcompat.content.res.AppCompatResources; import android.widget.ImageView; import com.amulyakhare.textdrawable.TextDrawable; diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/SystemContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/SystemContactPhoto.java index 817df232c0..863598a5e9 100644 --- a/src/org/thoughtcrime/securesms/contacts/avatars/SystemContactPhoto.java +++ b/src/org/thoughtcrime/securesms/contacts/avatars/SystemContactPhoto.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.contacts.avatars; import android.content.Context; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.util.Conversions; diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java index 25108a1dea..f341d04597 100644 --- a/src/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java +++ b/src/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.contacts.avatars; import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import com.makeramen.roundedimageview.RoundedDrawable; diff --git a/src/org/thoughtcrime/securesms/contactshare/Contact.java b/src/org/thoughtcrime/securesms/contactshare/Contact.java index 509ddca64c..aad4ade1ce 100644 --- a/src/org/thoughtcrime/securesms/contactshare/Contact.java +++ b/src/org/thoughtcrime/securesms/contactshare/Contact.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.contactshare; import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java b/src/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java index bf3632a787..2d439405dc 100644 --- a/src/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java +++ b/src/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java @@ -2,9 +2,9 @@ package org.thoughtcrime.securesms.contactshare; import android.content.Context; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java b/src/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java index 6d0d1ae5d3..3da1d742a4 100644 --- a/src/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java +++ b/src/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java @@ -1,10 +1,8 @@ package org.thoughtcrime.securesms.contactshare; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.attachments.Attachment; -import org.thoughtcrime.securesms.attachments.AttachmentId; import org.thoughtcrime.securesms.attachments.PointerAttachment; import org.whispersystems.libsignal.util.guava.Optional; import org.whispersystems.signalservice.api.messages.shared.SharedContact; diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactNameEditActivity.java b/src/org/thoughtcrime/securesms/contactshare/ContactNameEditActivity.java index ac721ffa1e..29309c096d 100644 --- a/src/org/thoughtcrime/securesms/contactshare/ContactNameEditActivity.java +++ b/src/org/thoughtcrime/securesms/contactshare/ContactNameEditActivity.java @@ -1,11 +1,11 @@ package org.thoughtcrime.securesms.contactshare; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.appcompat.widget.Toolbar; import android.widget.TextView; import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity; diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactNameEditViewModel.java b/src/org/thoughtcrime/securesms/contactshare/ContactNameEditViewModel.java index d902a1b23a..860d287157 100644 --- a/src/org/thoughtcrime/securesms/contactshare/ContactNameEditViewModel.java +++ b/src/org/thoughtcrime/securesms/contactshare/ContactNameEditViewModel.java @@ -1,11 +1,10 @@ package org.thoughtcrime.securesms.contactshare; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.MutableLiveData; -import android.arch.lifecycle.ViewModel; -import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import static org.thoughtcrime.securesms.contactshare.Contact.*; diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactRepository.java b/src/org/thoughtcrime/securesms/contactshare/ContactRepository.java index 01b688e004..f606d3444a 100644 --- a/src/org/thoughtcrime/securesms/contactshare/ContactRepository.java +++ b/src/org/thoughtcrime/securesms/contactshare/ContactRepository.java @@ -4,9 +4,9 @@ import android.content.Context; import android.database.Cursor; import android.net.Uri; import android.provider.ContactsContract; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import android.text.TextUtils; import org.thoughtcrime.securesms.contacts.ContactsDatabase; diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactShareEditActivity.java b/src/org/thoughtcrime/securesms/contactshare/ContactShareEditActivity.java index 5e0e001c1a..32b9dc80b4 100644 --- a/src/org/thoughtcrime/securesms/contactshare/ContactShareEditActivity.java +++ b/src/org/thoughtcrime/securesms/contactshare/ContactShareEditActivity.java @@ -1,21 +1,19 @@ package org.thoughtcrime.securesms.contactshare; import android.app.Activity; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.Toast; -import com.annimon.stream.Stream; - import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity; import network.loki.messenger.R; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactShareEditAdapter.java b/src/org/thoughtcrime/securesms/contactshare/ContactShareEditAdapter.java index 1f946220a7..699f4b9bad 100644 --- a/src/org/thoughtcrime/securesms/contactshare/ContactShareEditAdapter.java +++ b/src/org/thoughtcrime/securesms/contactshare/ContactShareEditAdapter.java @@ -1,19 +1,17 @@ package org.thoughtcrime.securesms.contactshare; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import com.bumptech.glide.load.engine.DiskCacheStrategy; - import network.loki.messenger.R; -import org.thoughtcrime.securesms.components.AvatarImageView; + import org.thoughtcrime.securesms.mms.GlideRequests; import java.util.ArrayList; diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactShareEditViewModel.java b/src/org/thoughtcrime/securesms/contactshare/ContactShareEditViewModel.java index 2e76612e94..860729cd45 100644 --- a/src/org/thoughtcrime/securesms/contactshare/ContactShareEditViewModel.java +++ b/src/org/thoughtcrime/securesms/contactshare/ContactShareEditViewModel.java @@ -1,11 +1,11 @@ package org.thoughtcrime.securesms.contactshare; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.MutableLiveData; -import android.arch.lifecycle.ViewModel; -import android.arch.lifecycle.ViewModelProvider; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; +import androidx.lifecycle.ViewModelProvider; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactUtil.java b/src/org/thoughtcrime/securesms/contactshare/ContactUtil.java index fbb7ddd641..b1db9417f6 100644 --- a/src/org/thoughtcrime/securesms/contactshare/ContactUtil.java +++ b/src/org/thoughtcrime/securesms/contactshare/ContactUtil.java @@ -5,11 +5,11 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.provider.ContactsContract; -import android.support.annotation.MainThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; -import android.support.v7.app.AlertDialog; +import androidx.annotation.MainThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; +import androidx.appcompat.app.AlertDialog; import android.text.TextUtils; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java b/src/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java index a41e9d9538..e16699e790 100644 --- a/src/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java +++ b/src/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java @@ -8,11 +8,11 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 2cdbe5334f..ed9620997d 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -19,7 +19,7 @@ package org.thoughtcrime.securesms.conversation; import android.Manifest; import android.annotation.SuppressLint; import android.annotation.TargetApi; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.content.ActivityNotFoundException; import android.content.BroadcastReceiver; import android.content.Context; @@ -42,17 +42,17 @@ import android.os.Handler; import android.os.Vibrator; import android.provider.Browser; import android.provider.Telephony; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.LocalBroadcastManager; -import android.support.v4.content.pm.ShortcutInfoCompat; -import android.support.v4.content.pm.ShortcutManagerCompat; -import android.support.v4.graphics.drawable.IconCompat; -import android.support.v4.view.MenuItemCompat; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.SearchView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.core.content.pm.ShortcutInfoCompat; +import androidx.core.content.pm.ShortcutManagerCompat; +import androidx.core.graphics.drawable.IconCompat; +import androidx.core.view.MenuItemCompat; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.widget.SearchView; +import androidx.appcompat.widget.Toolbar; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationAdapter.java b/src/org/thoughtcrime/securesms/conversation/ConversationAdapter.java index a26197a8b0..0182fde11e 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationAdapter.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationAdapter.java @@ -18,11 +18,11 @@ package org.thoughtcrime.securesms.conversation; import android.content.Context; import android.database.Cursor; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.VisibleForTesting; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java index abc28fd82c..97a7364366 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java @@ -26,19 +26,19 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.ActivityOptionsCompat; -import android.support.v4.app.Fragment; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.Loader; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.view.ActionMode; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.OnScrollListener; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.ActivityCompat; +import androidx.core.app.ActivityOptionsCompat; +import androidx.fragment.app.Fragment; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.view.ActionMode; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.OnScrollListener; import android.text.ClipboardManager; import android.text.TextUtils; import android.view.LayoutInflater; diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java index 74dc63dd15..ff0dc8509a 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java @@ -25,10 +25,10 @@ import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.Typeface; import android.net.Uri; -import android.support.annotation.DimenRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.AlertDialog; +import androidx.annotation.DimenRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; import android.text.Spannable; import android.text.SpannableString; import android.text.SpannableStringBuilder; diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java index b332171e8a..44611d5f44 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java @@ -4,7 +4,7 @@ import android.content.Intent; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; import android.os.Bundle; -import android.support.v4.app.ActivityOptionsCompat; +import androidx.core.app.ActivityOptionsCompat; import android.view.Display; import android.view.Gravity; import android.view.Menu; diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java b/src/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java index 0680a156f4..d83055071f 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java @@ -1,10 +1,10 @@ package org.thoughtcrime.securesms.conversation; import android.app.Application; -import android.arch.lifecycle.AndroidViewModel; -import android.arch.lifecycle.LiveData; +import androidx.lifecycle.AndroidViewModel; +import androidx.lifecycle.LiveData; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.contacts.ContactAccessor; import org.thoughtcrime.securesms.database.CursorList; diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationStickerSuggestionAdapter.java b/src/org/thoughtcrime/securesms/conversation/ConversationStickerSuggestionAdapter.java index d4b0912e4b..c033141197 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationStickerSuggestionAdapter.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationStickerSuggestionAdapter.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.conversation; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java b/src/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java index d55bb17536..8f8ff2a693 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java @@ -1,13 +1,13 @@ package org.thoughtcrime.securesms.conversation; import android.app.Application; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.MutableLiveData; -import android.arch.lifecycle.ViewModel; -import android.arch.lifecycle.ViewModelProvider; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; +import androidx.lifecycle.ViewModelProvider; import android.database.ContentObserver; import android.os.Handler; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import org.thoughtcrime.securesms.database.CursorList; diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java b/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java index 1c29f96f7b..dd13940587 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.conversation; import android.annotation.SuppressLint; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java index 42b10d38ba..008d4e79f7 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java @@ -5,8 +5,8 @@ import android.content.Intent; import android.graphics.Color; import android.graphics.PorterDuff; import android.graphics.PorterDuffColorFilter; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import android.widget.ImageView; diff --git a/src/org/thoughtcrime/securesms/crypto/AttachmentSecret.java b/src/org/thoughtcrime/securesms/crypto/AttachmentSecret.java index f3e09b98b5..b4425a7766 100644 --- a/src/org/thoughtcrime/securesms/crypto/AttachmentSecret.java +++ b/src/org/thoughtcrime/securesms/crypto/AttachmentSecret.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.crypto; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Base64; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/src/org/thoughtcrime/securesms/crypto/AttachmentSecretProvider.java b/src/org/thoughtcrime/securesms/crypto/AttachmentSecretProvider.java index 1c0ee3626c..2068e855d3 100644 --- a/src/org/thoughtcrime/securesms/crypto/AttachmentSecretProvider.java +++ b/src/org/thoughtcrime/securesms/crypto/AttachmentSecretProvider.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.crypto; import android.content.Context; import android.os.Build; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.util.TextSecurePreferences; diff --git a/src/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java b/src/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java index 585bf9952f..90a7285068 100644 --- a/src/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java +++ b/src/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java @@ -16,7 +16,7 @@ */ package org.thoughtcrime.securesms.crypto; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.LimitedInputStream; diff --git a/src/org/thoughtcrime/securesms/crypto/DatabaseSecret.java b/src/org/thoughtcrime/securesms/crypto/DatabaseSecret.java index ce58d94d55..bdd425e0c8 100644 --- a/src/org/thoughtcrime/securesms/crypto/DatabaseSecret.java +++ b/src/org/thoughtcrime/securesms/crypto/DatabaseSecret.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.crypto; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.util.Hex; diff --git a/src/org/thoughtcrime/securesms/crypto/DatabaseSecretProvider.java b/src/org/thoughtcrime/securesms/crypto/DatabaseSecretProvider.java index 86393e191a..152cf17b24 100644 --- a/src/org/thoughtcrime/securesms/crypto/DatabaseSecretProvider.java +++ b/src/org/thoughtcrime/securesms/crypto/DatabaseSecretProvider.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.crypto; import android.content.Context; import android.os.Build; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.util.TextSecurePreferences; diff --git a/src/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java b/src/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java index f18fde6ac2..f2fc74b687 100644 --- a/src/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java +++ b/src/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java @@ -20,7 +20,7 @@ package org.thoughtcrime.securesms.crypto; import android.content.Context; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.backup.BackupProtos; import org.thoughtcrime.securesms.util.Base64; diff --git a/src/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java b/src/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java index 6c29dcfa07..994c139434 100644 --- a/src/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java +++ b/src/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java @@ -4,8 +4,8 @@ package org.thoughtcrime.securesms.crypto; import android.os.Build; import android.security.keystore.KeyGenParameterSpec; import android.security.keystore.KeyProperties; -import android.support.annotation.NonNull; -import android.support.annotation.RequiresApi; +import androidx.annotation.NonNull; +import androidx.annotation.RequiresApi; import android.util.Base64; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/org/thoughtcrime/securesms/crypto/MasterCipher.java b/src/org/thoughtcrime/securesms/crypto/MasterCipher.java index c3549c1c7c..95fffc9903 100644 --- a/src/org/thoughtcrime/securesms/crypto/MasterCipher.java +++ b/src/org/thoughtcrime/securesms/crypto/MasterCipher.java @@ -17,7 +17,7 @@ */ package org.thoughtcrime.securesms.crypto; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.Base64; diff --git a/src/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java b/src/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java index 4d964d0291..6ca098650f 100644 --- a/src/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java +++ b/src/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java @@ -19,8 +19,8 @@ package org.thoughtcrime.securesms.crypto; import android.content.Context; import android.content.SharedPreferences; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import org.thoughtcrime.securesms.logging.Log; diff --git a/src/org/thoughtcrime/securesms/crypto/ModernDecryptingPartInputStream.java b/src/org/thoughtcrime/securesms/crypto/ModernDecryptingPartInputStream.java index bfe0672e73..e96da29dcf 100644 --- a/src/org/thoughtcrime/securesms/crypto/ModernDecryptingPartInputStream.java +++ b/src/org/thoughtcrime/securesms/crypto/ModernDecryptingPartInputStream.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.crypto; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.util.Conversions; diff --git a/src/org/thoughtcrime/securesms/crypto/ModernEncryptingPartOutputStream.java b/src/org/thoughtcrime/securesms/crypto/ModernEncryptingPartOutputStream.java index a62947e973..ab4efe84a9 100644 --- a/src/org/thoughtcrime/securesms/crypto/ModernEncryptingPartOutputStream.java +++ b/src/org/thoughtcrime/securesms/crypto/ModernEncryptingPartOutputStream.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.crypto; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Pair; import java.io.File; diff --git a/src/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java b/src/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java index ae88a2141a..e94edeb87b 100644 --- a/src/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java +++ b/src/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.crypto; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.util.Base64; import org.thoughtcrime.securesms.util.TextSecurePreferences; diff --git a/src/org/thoughtcrime/securesms/crypto/SessionUtil.java b/src/org/thoughtcrime/securesms/crypto/SessionUtil.java index 36f19b15ec..e16b666dd2 100644 --- a/src/org/thoughtcrime/securesms/crypto/SessionUtil.java +++ b/src/org/thoughtcrime/securesms/crypto/SessionUtil.java @@ -1,17 +1,14 @@ package org.thoughtcrime.securesms.crypto; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.crypto.storage.TextSecureSessionStore; import org.thoughtcrime.securesms.database.Address; import org.whispersystems.libsignal.SignalProtocolAddress; -import org.whispersystems.libsignal.state.SessionRecord; import org.whispersystems.libsignal.state.SessionStore; import org.whispersystems.signalservice.api.push.SignalServiceAddress; -import java.util.List; - public class SessionUtil { public static boolean hasSession(Context context, @NonNull Address address) { diff --git a/src/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java b/src/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java index 02b9c1f316..d3e7005c51 100644 --- a/src/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java +++ b/src/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java @@ -2,9 +2,9 @@ package org.thoughtcrime.securesms.crypto; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import org.signal.libsignal.metadata.SignalProtos; import org.signal.libsignal.metadata.certificate.CertificateValidator; diff --git a/src/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java b/src/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java index 0376fd495c..f88545bd4d 100644 --- a/src/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java +++ b/src/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.crypto.storage; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.whispersystems.libsignal.InvalidKeyIdException; diff --git a/src/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java b/src/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java index 0e67b89b42..0b089b6411 100644 --- a/src/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java +++ b/src/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.crypto.storage; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/src/org/thoughtcrime/securesms/database/Address.java b/src/org/thoughtcrime/securesms/database/Address.java index bf7457cdc3..ce13c5a9d8 100644 --- a/src/org/thoughtcrime/securesms/database/Address.java +++ b/src/org/thoughtcrime/securesms/database/Address.java @@ -4,9 +4,9 @@ package org.thoughtcrime.securesms.database; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Pair; diff --git a/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java b/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java index 918ffbd9d1..9342c63c71 100644 --- a/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java +++ b/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java @@ -24,9 +24,9 @@ import android.graphics.Bitmap; import android.media.MediaMetadataRetriever; import android.net.Uri; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.Pair; diff --git a/src/org/thoughtcrime/securesms/database/CursorList.java b/src/org/thoughtcrime/securesms/database/CursorList.java index 12bc39cb98..804e00f018 100644 --- a/src/org/thoughtcrime/securesms/database/CursorList.java +++ b/src/org/thoughtcrime/securesms/database/CursorList.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.database; import android.database.ContentObserver; import android.database.Cursor; import android.database.MatrixCursor; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.Collection; import java.util.Iterator; diff --git a/src/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java b/src/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java index a7cbec1c76..c8adb01166 100644 --- a/src/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java +++ b/src/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java @@ -19,11 +19,11 @@ package org.thoughtcrime.securesms.database; import android.content.Context; import android.database.Cursor; import android.database.DataSetObserver; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.VisibleForTesting; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.ViewHolder; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.VisibleForTesting; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/database/Database.java b/src/org/thoughtcrime/securesms/database/Database.java index bffb0678f9..b1fd5eadb2 100644 --- a/src/org/thoughtcrime/securesms/database/Database.java +++ b/src/org/thoughtcrime/securesms/database/Database.java @@ -19,7 +19,7 @@ package org.thoughtcrime.securesms.database; import android.content.Context; import android.database.ContentObserver; import android.database.Cursor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; diff --git a/src/org/thoughtcrime/securesms/database/DatabaseContentProviders.java b/src/org/thoughtcrime/securesms/database/DatabaseContentProviders.java index 44d4607cdf..a8a718b3b0 100644 --- a/src/org/thoughtcrime/securesms/database/DatabaseContentProviders.java +++ b/src/org/thoughtcrime/securesms/database/DatabaseContentProviders.java @@ -4,8 +4,8 @@ import android.content.ContentProvider; import android.content.ContentValues; import android.database.Cursor; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * Starting in API 26, a {@link ContentProvider} needs to be defined for each authority you wish to diff --git a/src/org/thoughtcrime/securesms/database/DatabaseFactory.java b/src/org/thoughtcrime/securesms/database/DatabaseFactory.java index d945967507..164f60762f 100644 --- a/src/org/thoughtcrime/securesms/database/DatabaseFactory.java +++ b/src/org/thoughtcrime/securesms/database/DatabaseFactory.java @@ -17,7 +17,7 @@ package org.thoughtcrime.securesms.database; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import net.sqlcipher.database.SQLiteDatabase; diff --git a/src/org/thoughtcrime/securesms/database/DraftDatabase.java b/src/org/thoughtcrime/securesms/database/DraftDatabase.java index 32cbce2f01..27435bfc1e 100644 --- a/src/org/thoughtcrime/securesms/database/DraftDatabase.java +++ b/src/org/thoughtcrime/securesms/database/DraftDatabase.java @@ -4,7 +4,7 @@ import android.content.ContentValues; import android.content.Context; import android.database.Cursor; import android.net.Uri; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import net.sqlcipher.database.SQLiteDatabase; diff --git a/src/org/thoughtcrime/securesms/database/FastCursorRecyclerViewAdapter.java b/src/org/thoughtcrime/securesms/database/FastCursorRecyclerViewAdapter.java index 8b07bdbee5..4dfe6a20b5 100644 --- a/src/org/thoughtcrime/securesms/database/FastCursorRecyclerViewAdapter.java +++ b/src/org/thoughtcrime/securesms/database/FastCursorRecyclerViewAdapter.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.database; import android.content.Context; import android.database.Cursor; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import java.util.Iterator; import java.util.LinkedList; diff --git a/src/org/thoughtcrime/securesms/database/GroupDatabase.java b/src/org/thoughtcrime/securesms/database/GroupDatabase.java index f873bfa97d..c14aff87d5 100644 --- a/src/org/thoughtcrime/securesms/database/GroupDatabase.java +++ b/src/org/thoughtcrime/securesms/database/GroupDatabase.java @@ -6,8 +6,8 @@ import android.content.ContentValues; import android.content.Context; import android.database.Cursor; import android.graphics.Bitmap; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java b/src/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java index 58a6fdad9a..4d83184a57 100644 --- a/src/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java +++ b/src/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java @@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.database; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import net.sqlcipher.database.SQLiteDatabase; diff --git a/src/org/thoughtcrime/securesms/database/IdentityDatabase.java b/src/org/thoughtcrime/securesms/database/IdentityDatabase.java index f768736062..c3d88e8674 100644 --- a/src/org/thoughtcrime/securesms/database/IdentityDatabase.java +++ b/src/org/thoughtcrime/securesms/database/IdentityDatabase.java @@ -19,8 +19,8 @@ package org.thoughtcrime.securesms.database; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import net.sqlcipher.database.SQLiteDatabase; diff --git a/src/org/thoughtcrime/securesms/database/JobDatabase.java b/src/org/thoughtcrime/securesms/database/JobDatabase.java index d9a05e29cc..1a64eed210 100644 --- a/src/org/thoughtcrime/securesms/database/JobDatabase.java +++ b/src/org/thoughtcrime/securesms/database/JobDatabase.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.database; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import net.sqlcipher.database.SQLiteDatabase; diff --git a/src/org/thoughtcrime/securesms/database/MediaDatabase.java b/src/org/thoughtcrime/securesms/database/MediaDatabase.java index e6811ba229..523a168c57 100644 --- a/src/org/thoughtcrime/securesms/database/MediaDatabase.java +++ b/src/org/thoughtcrime/securesms/database/MediaDatabase.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.database; import android.content.Context; import android.database.ContentObserver; import android.database.Cursor; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import net.sqlcipher.database.SQLiteDatabase; diff --git a/src/org/thoughtcrime/securesms/database/MmsDatabase.java b/src/org/thoughtcrime/securesms/database/MmsDatabase.java index 3bdb6feae9..5e9ff400aa 100644 --- a/src/org/thoughtcrime/securesms/database/MmsDatabase.java +++ b/src/org/thoughtcrime/securesms/database/MmsDatabase.java @@ -20,8 +20,8 @@ import android.content.ContentValues; import android.content.Context; import android.database.Cursor; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Pair; diff --git a/src/org/thoughtcrime/securesms/database/MmsSmsDatabase.java b/src/org/thoughtcrime/securesms/database/MmsSmsDatabase.java index bfe549eb29..1d6fe88903 100644 --- a/src/org/thoughtcrime/securesms/database/MmsSmsDatabase.java +++ b/src/org/thoughtcrime/securesms/database/MmsSmsDatabase.java @@ -18,8 +18,8 @@ package org.thoughtcrime.securesms.database; import android.content.Context; import android.database.Cursor; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import net.sqlcipher.database.SQLiteDatabase; import net.sqlcipher.database.SQLiteQueryBuilder; diff --git a/src/org/thoughtcrime/securesms/database/ObservableContent.java b/src/org/thoughtcrime/securesms/database/ObservableContent.java index 874fb36129..ff74f3a759 100644 --- a/src/org/thoughtcrime/securesms/database/ObservableContent.java +++ b/src/org/thoughtcrime/securesms/database/ObservableContent.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.database; import android.database.ContentObserver; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.io.Closeable; diff --git a/src/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.java b/src/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.java index 327a15ef4a..1f59110f8d 100644 --- a/src/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.java +++ b/src/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.java @@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.database; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.logging.Log; import net.sqlcipher.database.SQLiteDatabase; diff --git a/src/org/thoughtcrime/securesms/database/PushDatabase.java b/src/org/thoughtcrime/securesms/database/PushDatabase.java index 3219db08d8..55472f3117 100644 --- a/src/org/thoughtcrime/securesms/database/PushDatabase.java +++ b/src/org/thoughtcrime/securesms/database/PushDatabase.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.database; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.logging.Log; import net.sqlcipher.database.SQLiteDatabase; diff --git a/src/org/thoughtcrime/securesms/database/RecipientDatabase.java b/src/org/thoughtcrime/securesms/database/RecipientDatabase.java index 8553b2b73c..62e4458602 100644 --- a/src/org/thoughtcrime/securesms/database/RecipientDatabase.java +++ b/src/org/thoughtcrime/securesms/database/RecipientDatabase.java @@ -4,8 +4,8 @@ import android.content.ContentValues; import android.content.Context; import android.database.Cursor; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/database/SearchDatabase.java b/src/org/thoughtcrime/securesms/database/SearchDatabase.java index a90460aa7c..0c3cc4ce23 100644 --- a/src/org/thoughtcrime/securesms/database/SearchDatabase.java +++ b/src/org/thoughtcrime/securesms/database/SearchDatabase.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.database; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/database/SessionDatabase.java b/src/org/thoughtcrime/securesms/database/SessionDatabase.java index 27cbb85c33..1730249988 100644 --- a/src/org/thoughtcrime/securesms/database/SessionDatabase.java +++ b/src/org/thoughtcrime/securesms/database/SessionDatabase.java @@ -4,8 +4,8 @@ package org.thoughtcrime.securesms.database; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import net.sqlcipher.database.SQLiteDatabase; diff --git a/src/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java b/src/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java index c2529d8a7d..810cb54c78 100644 --- a/src/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java +++ b/src/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java @@ -4,8 +4,8 @@ package org.thoughtcrime.securesms.database; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import net.sqlcipher.database.SQLiteDatabase; diff --git a/src/org/thoughtcrime/securesms/database/SmsDatabase.java b/src/org/thoughtcrime/securesms/database/SmsDatabase.java index 5b99737b18..308b948ed9 100644 --- a/src/org/thoughtcrime/securesms/database/SmsDatabase.java +++ b/src/org/thoughtcrime/securesms/database/SmsDatabase.java @@ -20,7 +20,7 @@ package org.thoughtcrime.securesms.database; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.util.Pair; diff --git a/src/org/thoughtcrime/securesms/database/SmsMigrator.java b/src/org/thoughtcrime/securesms/database/SmsMigrator.java index f73acd496f..5eaae3d178 100644 --- a/src/org/thoughtcrime/securesms/database/SmsMigrator.java +++ b/src/org/thoughtcrime/securesms/database/SmsMigrator.java @@ -20,7 +20,7 @@ import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteException; import android.net.Uri; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import net.sqlcipher.database.SQLiteDatabase; import net.sqlcipher.database.SQLiteStatement; diff --git a/src/org/thoughtcrime/securesms/database/StickerDatabase.java b/src/org/thoughtcrime/securesms/database/StickerDatabase.java index d850aa8aa6..561ffd93cd 100644 --- a/src/org/thoughtcrime/securesms/database/StickerDatabase.java +++ b/src/org/thoughtcrime/securesms/database/StickerDatabase.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.database; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Pair; diff --git a/src/org/thoughtcrime/securesms/database/ThreadDatabase.java b/src/org/thoughtcrime/securesms/database/ThreadDatabase.java index d11e3c9573..1de021e206 100644 --- a/src/org/thoughtcrime/securesms/database/ThreadDatabase.java +++ b/src/org/thoughtcrime/securesms/database/ThreadDatabase.java @@ -22,8 +22,8 @@ import android.content.Context; import android.database.Cursor; import android.database.MergeCursor; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java b/src/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java index 7c9fe9974e..64123f535f 100644 --- a/src/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java +++ b/src/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java @@ -7,7 +7,7 @@ import android.database.Cursor; import android.database.sqlite.SQLiteConstraintException; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.fasterxml.jackson.annotation.JsonProperty; @@ -30,7 +30,6 @@ import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.database.SmsDatabase; import org.thoughtcrime.securesms.database.ThreadDatabase; import org.thoughtcrime.securesms.logging.Log; -import org.thoughtcrime.securesms.notifications.MessageNotifier; import org.thoughtcrime.securesms.util.Base64; import org.thoughtcrime.securesms.util.DelimiterUtil; import org.thoughtcrime.securesms.util.Hex; diff --git a/src/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java b/src/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java index c392bc8345..8b05f26d6b 100644 --- a/src/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java +++ b/src/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.database.helpers; import android.content.ContentValues; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java b/src/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java index bab82dc181..42d2c7a687 100644 --- a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java +++ b/src/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java @@ -4,8 +4,8 @@ package org.thoughtcrime.securesms.database.helpers; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import org.thoughtcrime.securesms.logging.Log; import android.util.Pair; diff --git a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java b/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java index 58afc5520d..4d0da39a3c 100644 --- a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java +++ b/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java @@ -6,7 +6,7 @@ import android.content.Context; import android.database.Cursor; import android.net.Uri; import android.os.SystemClock; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import net.sqlcipher.database.SQLiteDatabase; diff --git a/src/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java b/src/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java index 27534f1646..6f50bd1616 100644 --- a/src/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java +++ b/src/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java @@ -4,14 +4,13 @@ package org.thoughtcrime.securesms.database.loaders; import android.content.Context; import android.database.ContentObserver; import android.database.Cursor; -import android.support.annotation.NonNull; -import android.support.v4.content.AsyncTaskLoader; +import androidx.annotation.NonNull; +import androidx.loader.content.AsyncTaskLoader; import com.annimon.stream.Stream; import network.loki.messenger.R; import org.thoughtcrime.securesms.database.Address; -import org.thoughtcrime.securesms.database.Database; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MediaDatabase; import org.thoughtcrime.securesms.recipients.Recipient; diff --git a/src/org/thoughtcrime/securesms/database/loaders/CountryListLoader.java b/src/org/thoughtcrime/securesms/database/loaders/CountryListLoader.java index 2c36df2a59..1ad5d71e48 100644 --- a/src/org/thoughtcrime/securesms/database/loaders/CountryListLoader.java +++ b/src/org/thoughtcrime/securesms/database/loaders/CountryListLoader.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.database.loaders; import android.content.Context; -import android.support.v4.content.AsyncTaskLoader; +import androidx.loader.content.AsyncTaskLoader; import java.util.ArrayList; import java.util.Comparator; diff --git a/src/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java b/src/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java index 24bf81d97a..711d557ce9 100644 --- a/src/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java +++ b/src/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.database.loaders; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java b/src/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java index 49d8f1028e..8ada82ce1d 100644 --- a/src/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java +++ b/src/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java @@ -4,9 +4,9 @@ package org.thoughtcrime.securesms.database.loaders; import android.content.Context; import android.database.Cursor; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.util.Pair; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.util.Pair; import org.thoughtcrime.securesms.attachments.AttachmentId; import org.thoughtcrime.securesms.database.AttachmentDatabase; diff --git a/src/org/thoughtcrime/securesms/database/loaders/RecentPhotosLoader.java b/src/org/thoughtcrime/securesms/database/loaders/RecentPhotosLoader.java index e571beb016..7ed0184e8e 100644 --- a/src/org/thoughtcrime/securesms/database/loaders/RecentPhotosLoader.java +++ b/src/org/thoughtcrime/securesms/database/loaders/RecentPhotosLoader.java @@ -6,7 +6,7 @@ import android.content.Context; import android.database.Cursor; import android.net.Uri; import android.provider.MediaStore; -import android.support.v4.content.CursorLoader; +import androidx.loader.content.CursorLoader; import org.thoughtcrime.securesms.permissions.Permissions; diff --git a/src/org/thoughtcrime/securesms/database/loaders/ThreadMediaLoader.java b/src/org/thoughtcrime/securesms/database/loaders/ThreadMediaLoader.java index 5bfe4e12db..0e8fc9a0b5 100644 --- a/src/org/thoughtcrime/securesms/database/loaders/ThreadMediaLoader.java +++ b/src/org/thoughtcrime/securesms/database/loaders/ThreadMediaLoader.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.database.loaders; import android.content.Context; import android.database.Cursor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/src/org/thoughtcrime/securesms/database/model/DisplayRecord.java b/src/org/thoughtcrime/securesms/database/model/DisplayRecord.java index 314e2c1d9d..12be5f89a5 100644 --- a/src/org/thoughtcrime/securesms/database/model/DisplayRecord.java +++ b/src/org/thoughtcrime/securesms/database/model/DisplayRecord.java @@ -17,7 +17,7 @@ package org.thoughtcrime.securesms.database.model; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.SpannableString; import org.thoughtcrime.securesms.database.MmsSmsColumns; diff --git a/src/org/thoughtcrime/securesms/database/model/IncomingSticker.java b/src/org/thoughtcrime/securesms/database/model/IncomingSticker.java index 5e982e0daa..4614bf57cc 100644 --- a/src/org/thoughtcrime/securesms/database/model/IncomingSticker.java +++ b/src/org/thoughtcrime/securesms/database/model/IncomingSticker.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.database.model; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class IncomingSticker { diff --git a/src/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java b/src/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java index f6ff433123..f03ce5ffce 100644 --- a/src/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java +++ b/src/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java @@ -17,8 +17,8 @@ package org.thoughtcrime.securesms.database.model; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.SpannableString; import network.loki.messenger.R; diff --git a/src/org/thoughtcrime/securesms/database/model/MessageRecord.java b/src/org/thoughtcrime/securesms/database/model/MessageRecord.java index 0531562b73..1718d14451 100644 --- a/src/org/thoughtcrime/securesms/database/model/MessageRecord.java +++ b/src/org/thoughtcrime/securesms/database/model/MessageRecord.java @@ -17,7 +17,7 @@ package org.thoughtcrime.securesms.database.model; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Spannable; import android.text.SpannableString; import android.text.style.RelativeSizeSpan; diff --git a/src/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java b/src/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java index 9657f3151b..679c8f15f5 100644 --- a/src/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java +++ b/src/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java @@ -1,9 +1,8 @@ package org.thoughtcrime.securesms.database.model; -import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.contactshare.Contact; import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch; diff --git a/src/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java b/src/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java index 1c4317bf5d..e58ba7543f 100644 --- a/src/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java +++ b/src/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java @@ -17,7 +17,7 @@ package org.thoughtcrime.securesms.database.model; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.SpannableString; import network.loki.messenger.R; diff --git a/src/org/thoughtcrime/securesms/database/model/Quote.java b/src/org/thoughtcrime/securesms/database/model/Quote.java index 2c99d8f7f6..638ca9d71a 100644 --- a/src/org/thoughtcrime/securesms/database/model/Quote.java +++ b/src/org/thoughtcrime/securesms/database/model/Quote.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.database.model; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.mms.SlideDeck; diff --git a/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java b/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java index 056dbacb45..231696af07 100644 --- a/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java +++ b/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java @@ -18,7 +18,7 @@ package org.thoughtcrime.securesms.database.model; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.SpannableString; import org.thoughtcrime.securesms.database.MmsSmsColumns; diff --git a/src/org/thoughtcrime/securesms/database/model/Sticker.java b/src/org/thoughtcrime/securesms/database/model/Sticker.java index b3d775ea3a..9ee97c131a 100644 --- a/src/org/thoughtcrime/securesms/database/model/Sticker.java +++ b/src/org/thoughtcrime/securesms/database/model/Sticker.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.database.model; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.attachments.Attachment; diff --git a/src/org/thoughtcrime/securesms/database/model/StickerPackRecord.java b/src/org/thoughtcrime/securesms/database/model/StickerPackRecord.java index 246a57157e..1ce61317ad 100644 --- a/src/org/thoughtcrime/securesms/database/model/StickerPackRecord.java +++ b/src/org/thoughtcrime/securesms/database/model/StickerPackRecord.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.database.model; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import org.whispersystems.libsignal.util.guava.Optional; diff --git a/src/org/thoughtcrime/securesms/database/model/StickerRecord.java b/src/org/thoughtcrime/securesms/database/model/StickerRecord.java index bb7ae00a9c..76ad74fbdf 100644 --- a/src/org/thoughtcrime/securesms/database/model/StickerRecord.java +++ b/src/org/thoughtcrime/securesms/database/model/StickerRecord.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.database.model; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.mms.PartAuthority; diff --git a/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java b/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java index 6aba9e9165..1cf2c6d328 100644 --- a/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java +++ b/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java @@ -19,8 +19,8 @@ package org.thoughtcrime.securesms.database.model; import android.content.Context; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.Spannable; import android.text.SpannableString; import android.text.TextUtils; diff --git a/src/org/thoughtcrime/securesms/events/PartProgressEvent.java b/src/org/thoughtcrime/securesms/events/PartProgressEvent.java index 30817fd7de..b824ec16cf 100644 --- a/src/org/thoughtcrime/securesms/events/PartProgressEvent.java +++ b/src/org/thoughtcrime/securesms/events/PartProgressEvent.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.events; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.attachments.Attachment; diff --git a/src/org/thoughtcrime/securesms/events/RedPhoneEvent.java b/src/org/thoughtcrime/securesms/events/RedPhoneEvent.java index 0fcd3f97f6..92f949aa31 100644 --- a/src/org/thoughtcrime/securesms/events/RedPhoneEvent.java +++ b/src/org/thoughtcrime/securesms/events/RedPhoneEvent.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.events; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.recipients.Recipient; diff --git a/src/org/thoughtcrime/securesms/events/WebRtcViewModel.java b/src/org/thoughtcrime/securesms/events/WebRtcViewModel.java index 442186e6f7..a376b888e9 100644 --- a/src/org/thoughtcrime/securesms/events/WebRtcViewModel.java +++ b/src/org/thoughtcrime/securesms/events/WebRtcViewModel.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.events; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.webrtc.CameraState; diff --git a/src/org/thoughtcrime/securesms/giph/model/ChunkedImageUrl.java b/src/org/thoughtcrime/securesms/giph/model/ChunkedImageUrl.java index bf5ee63659..170b9dbe78 100644 --- a/src/org/thoughtcrime/securesms/giph/model/ChunkedImageUrl.java +++ b/src/org/thoughtcrime/securesms/giph/model/ChunkedImageUrl.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.giph.model; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.bumptech.glide.load.Key; diff --git a/src/org/thoughtcrime/securesms/giph/net/GiphyGifLoader.java b/src/org/thoughtcrime/securesms/giph/net/GiphyGifLoader.java index e832d23bf4..7be6a88197 100644 --- a/src/org/thoughtcrime/securesms/giph/net/GiphyGifLoader.java +++ b/src/org/thoughtcrime/securesms/giph/net/GiphyGifLoader.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.giph.net; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; public class GiphyGifLoader extends GiphyLoader { diff --git a/src/org/thoughtcrime/securesms/giph/net/GiphyLoader.java b/src/org/thoughtcrime/securesms/giph/net/GiphyLoader.java index d1169990c3..fa29aaf660 100644 --- a/src/org/thoughtcrime/securesms/giph/net/GiphyLoader.java +++ b/src/org/thoughtcrime/securesms/giph/net/GiphyLoader.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.giph.net; import android.content.Context; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import org.thoughtcrime.securesms.logging.Log; diff --git a/src/org/thoughtcrime/securesms/giph/net/GiphyStickerLoader.java b/src/org/thoughtcrime/securesms/giph/net/GiphyStickerLoader.java index 9290fc2dab..7ce5fe2532 100644 --- a/src/org/thoughtcrime/securesms/giph/net/GiphyStickerLoader.java +++ b/src/org/thoughtcrime/securesms/giph/net/GiphyStickerLoader.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.giph.net; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; public class GiphyStickerLoader extends GiphyLoader { diff --git a/src/org/thoughtcrime/securesms/giph/ui/AspectRatioImageView.java b/src/org/thoughtcrime/securesms/giph/ui/AspectRatioImageView.java index 3a7c746821..3d1e62dd98 100644 --- a/src/org/thoughtcrime/securesms/giph/ui/AspectRatioImageView.java +++ b/src/org/thoughtcrime/securesms/giph/ui/AspectRatioImageView.java @@ -18,7 +18,7 @@ package org.thoughtcrime.securesms.giph.ui; import android.content.Context; -import android.support.v7.widget.AppCompatImageView; +import androidx.appcompat.widget.AppCompatImageView; import android.util.AttributeSet; /** diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java b/src/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java index e9213807fc..40bcd152ea 100644 --- a/src/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java +++ b/src/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java @@ -7,13 +7,13 @@ import android.content.Intent; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.viewpager.widget.ViewPager; import org.thoughtcrime.securesms.logging.Log; import android.view.View; import android.widget.Toast; diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java b/src/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java index dd2efc9687..93293bcff0 100644 --- a/src/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java +++ b/src/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java @@ -3,9 +3,9 @@ package org.thoughtcrime.securesms.giph.ui; import android.content.Context; import android.graphics.Rect; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.Toolbar; import android.text.Editable; import android.text.InputType; import android.text.TextWatcher; diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java b/src/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java index 0e924411a6..fe5f2eaff1 100644 --- a/src/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java +++ b/src/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java @@ -4,9 +4,9 @@ package org.thoughtcrime.securesms.giph.ui; import android.content.Context; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import org.thoughtcrime.securesms.logging.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java b/src/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java index 793a06c498..4c1ff9be8d 100644 --- a/src/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java +++ b/src/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java @@ -2,15 +2,15 @@ package org.thoughtcrime.securesms.giph.ui; import android.os.AsyncTask; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.Loader; -import android.support.v7.widget.DefaultItemAnimator; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.StaggeredGridLayoutManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.StaggeredGridLayoutManager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyGifFragment.java b/src/org/thoughtcrime/securesms/giph/ui/GiphyGifFragment.java index d38007b4a9..4c8ad66dcf 100644 --- a/src/org/thoughtcrime/securesms/giph/ui/GiphyGifFragment.java +++ b/src/org/thoughtcrime/securesms/giph/ui/GiphyGifFragment.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.giph.ui; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.content.Loader; +import androidx.annotation.NonNull; +import androidx.loader.content.Loader; import org.thoughtcrime.securesms.giph.model.GiphyImage; import org.thoughtcrime.securesms.giph.net.GiphyGifLoader; diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyStickerFragment.java b/src/org/thoughtcrime/securesms/giph/ui/GiphyStickerFragment.java index 1b0289155f..0b838b4718 100644 --- a/src/org/thoughtcrime/securesms/giph/ui/GiphyStickerFragment.java +++ b/src/org/thoughtcrime/securesms/giph/ui/GiphyStickerFragment.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.giph.ui; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.content.Loader; +import androidx.annotation.NonNull; +import androidx.loader.content.Loader; import org.thoughtcrime.securesms.giph.model.GiphyImage; import org.thoughtcrime.securesms.giph.net.GiphyStickerLoader; diff --git a/src/org/thoughtcrime/securesms/giph/util/InfiniteScrollListener.java b/src/org/thoughtcrime/securesms/giph/util/InfiniteScrollListener.java index 872fc28a61..ef0dfbedb1 100644 --- a/src/org/thoughtcrime/securesms/giph/util/InfiniteScrollListener.java +++ b/src/org/thoughtcrime/securesms/giph/util/InfiniteScrollListener.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.giph.util; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; public abstract class InfiniteScrollListener extends RecyclerView.OnScrollListener { diff --git a/src/org/thoughtcrime/securesms/giph/util/RecyclerViewPositionHelper.java b/src/org/thoughtcrime/securesms/giph/util/RecyclerViewPositionHelper.java index e2a62ec17d..bd04b89569 100644 --- a/src/org/thoughtcrime/securesms/giph/util/RecyclerViewPositionHelper.java +++ b/src/org/thoughtcrime/securesms/giph/util/RecyclerViewPositionHelper.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.giph.util; -import android.support.v7.widget.OrientationHelper; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.OrientationHelper; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; public class RecyclerViewPositionHelper { diff --git a/src/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java b/src/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java index b0b7adc4a6..e365a371d2 100644 --- a/src/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java +++ b/src/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.glide; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.bumptech.glide.Priority; import com.bumptech.glide.load.DataSource; diff --git a/src/org/thoughtcrime/securesms/glide/ChunkedImageUrlLoader.java b/src/org/thoughtcrime/securesms/glide/ChunkedImageUrlLoader.java index af6fa8faa6..3c3ec2713d 100644 --- a/src/org/thoughtcrime/securesms/glide/ChunkedImageUrlLoader.java +++ b/src/org/thoughtcrime/securesms/glide/ChunkedImageUrlLoader.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.glide; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bumptech.glide.load.Options; import com.bumptech.glide.load.model.ModelLoader; diff --git a/src/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java b/src/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java index e8d22713fc..195c5b23b8 100644 --- a/src/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java +++ b/src/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.glide; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.bumptech.glide.Priority; import com.bumptech.glide.load.DataSource; diff --git a/src/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java b/src/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java index fa18edb08e..2d9cd545d8 100644 --- a/src/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java +++ b/src/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.glide; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bumptech.glide.load.Options; import com.bumptech.glide.load.model.ModelLoader; diff --git a/src/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java b/src/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java index cf85ee1bb1..9b0bbf2056 100644 --- a/src/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java +++ b/src/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.glide; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.bumptech.glide.Priority; import com.bumptech.glide.load.DataSource; diff --git a/src/org/thoughtcrime/securesms/glide/OkHttpUrlLoader.java b/src/org/thoughtcrime/securesms/glide/OkHttpUrlLoader.java index 39637f76d8..bfe5aae7d3 100644 --- a/src/org/thoughtcrime/securesms/glide/OkHttpUrlLoader.java +++ b/src/org/thoughtcrime/securesms/glide/OkHttpUrlLoader.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.glide; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bumptech.glide.load.Options; import com.bumptech.glide.load.model.GlideUrl; diff --git a/src/org/thoughtcrime/securesms/glide/PaddedHeadersInterceptor.java b/src/org/thoughtcrime/securesms/glide/PaddedHeadersInterceptor.java index e602935874..5d0ab584b7 100644 --- a/src/org/thoughtcrime/securesms/glide/PaddedHeadersInterceptor.java +++ b/src/org/thoughtcrime/securesms/glide/PaddedHeadersInterceptor.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.glide; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.io.IOException; import java.security.SecureRandom; diff --git a/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java b/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java index 2f5cfdfb14..29f7da6975 100644 --- a/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java +++ b/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.glide.cache; import android.graphics.Bitmap; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.logging.Log; import com.bumptech.glide.load.Options; diff --git a/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java b/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java index 507392e69f..7541e73d9c 100644 --- a/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java +++ b/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.glide.cache; import android.graphics.Bitmap; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.logging.Log; import com.bumptech.glide.load.EncodeStrategy; diff --git a/src/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java b/src/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java index db18927ec5..361f7bba94 100644 --- a/src/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java +++ b/src/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.glide.cache; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.bumptech.glide.load.Encoder; import com.bumptech.glide.load.Options; diff --git a/src/org/thoughtcrime/securesms/glide/cache/EncryptedCoder.java b/src/org/thoughtcrime/securesms/glide/cache/EncryptedCoder.java index ed7f7d622f..b751507ee4 100644 --- a/src/org/thoughtcrime/securesms/glide/cache/EncryptedCoder.java +++ b/src/org/thoughtcrime/securesms/glide/cache/EncryptedCoder.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.glide.cache; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.util.Util; diff --git a/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java b/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java index a7b5e10ba2..b3bd17ec04 100644 --- a/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java +++ b/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.glide.cache; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.logging.Log; import com.bumptech.glide.load.Options; diff --git a/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java b/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java index 24d1bb76b5..0326ed15bd 100644 --- a/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java +++ b/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.glide.cache; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.logging.Log; import com.bumptech.glide.load.EncodeStrategy; diff --git a/src/org/thoughtcrime/securesms/groups/GroupManager.java b/src/org/thoughtcrime/securesms/groups/GroupManager.java index ee37c5e4f6..81f6feec33 100644 --- a/src/org/thoughtcrime/securesms/groups/GroupManager.java +++ b/src/org/thoughtcrime/securesms/groups/GroupManager.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.groups; import android.content.Context; import android.graphics.Bitmap; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.protobuf.ByteString; diff --git a/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java b/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java index f7c9bb9de6..4b2549344d 100644 --- a/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java +++ b/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.groups; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.protobuf.ByteString; diff --git a/src/org/thoughtcrime/securesms/imageeditor/Bounds.java b/src/org/thoughtcrime/securesms/imageeditor/Bounds.java index f5d4e0ca5a..3b074dccea 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/Bounds.java +++ b/src/org/thoughtcrime/securesms/imageeditor/Bounds.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.imageeditor; import android.graphics.Matrix; import android.graphics.RectF; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * The local extent of a {@link org.thoughtcrime.securesms.imageeditor.model.EditorElement}. diff --git a/src/org/thoughtcrime/securesms/imageeditor/CanvasMatrix.java b/src/org/thoughtcrime/securesms/imageeditor/CanvasMatrix.java index b3fd5bbd9c..21546a5a6e 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/CanvasMatrix.java +++ b/src/org/thoughtcrime/securesms/imageeditor/CanvasMatrix.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.imageeditor; import android.graphics.Canvas; import android.graphics.Matrix; import android.graphics.RectF; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Tracks the current matrix for a canvas. diff --git a/src/org/thoughtcrime/securesms/imageeditor/ColorableRenderer.java b/src/org/thoughtcrime/securesms/imageeditor/ColorableRenderer.java index 71a159711a..11706dfc02 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/ColorableRenderer.java +++ b/src/org/thoughtcrime/securesms/imageeditor/ColorableRenderer.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.imageeditor; -import android.support.annotation.ColorInt; +import androidx.annotation.ColorInt; /** * A renderer that can have its color changed. diff --git a/src/org/thoughtcrime/securesms/imageeditor/DrawingSession.java b/src/org/thoughtcrime/securesms/imageeditor/DrawingSession.java index 05ef7ad22a..350edaed0a 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/DrawingSession.java +++ b/src/org/thoughtcrime/securesms/imageeditor/DrawingSession.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.imageeditor; import android.graphics.Matrix; import android.graphics.PointF; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.imageeditor.model.EditorElement; import org.thoughtcrime.securesms.imageeditor.renderers.BezierDrawingRenderer; diff --git a/src/org/thoughtcrime/securesms/imageeditor/EditSession.java b/src/org/thoughtcrime/securesms/imageeditor/EditSession.java index cd883cf562..b57b472c70 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/EditSession.java +++ b/src/org/thoughtcrime/securesms/imageeditor/EditSession.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.imageeditor; import android.graphics.Matrix; import android.graphics.PointF; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.imageeditor.model.EditorElement; diff --git a/src/org/thoughtcrime/securesms/imageeditor/ElementDragEditSession.java b/src/org/thoughtcrime/securesms/imageeditor/ElementDragEditSession.java index 27cbb0cdcb..a05f1cce21 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/ElementDragEditSession.java +++ b/src/org/thoughtcrime/securesms/imageeditor/ElementDragEditSession.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.imageeditor; import android.graphics.Matrix; import android.graphics.PointF; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.imageeditor.model.EditorElement; diff --git a/src/org/thoughtcrime/securesms/imageeditor/ElementEditSession.java b/src/org/thoughtcrime/securesms/imageeditor/ElementEditSession.java index 4dd7221121..315710653c 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/ElementEditSession.java +++ b/src/org/thoughtcrime/securesms/imageeditor/ElementEditSession.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.imageeditor; import android.graphics.Matrix; import android.graphics.PointF; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.imageeditor.model.EditorElement; diff --git a/src/org/thoughtcrime/securesms/imageeditor/ElementScaleEditSession.java b/src/org/thoughtcrime/securesms/imageeditor/ElementScaleEditSession.java index 4594c964a7..046f482fc7 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/ElementScaleEditSession.java +++ b/src/org/thoughtcrime/securesms/imageeditor/ElementScaleEditSession.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.imageeditor; import android.graphics.Matrix; import android.graphics.PointF; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.imageeditor.model.EditorElement; diff --git a/src/org/thoughtcrime/securesms/imageeditor/HiddenEditText.java b/src/org/thoughtcrime/securesms/imageeditor/HiddenEditText.java index 03e252ab3d..7a25d0cf5b 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/HiddenEditText.java +++ b/src/org/thoughtcrime/securesms/imageeditor/HiddenEditText.java @@ -4,7 +4,7 @@ import android.annotation.SuppressLint; import android.content.Context; import android.graphics.Color; import android.graphics.Rect; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.InputType; import android.util.TypedValue; import android.view.Gravity; @@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.imageeditor.renderers.TextRenderer; /** * Invisible {@link android.widget.EditText} that is used during in-image text editing. */ -final class HiddenEditText extends android.support.v7.widget.AppCompatEditText { +final class HiddenEditText extends androidx.appcompat.widget.AppCompatEditText { @SuppressLint("InlinedApi") private static final int INCOGNITO_KEYBOARD_IME = EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING; diff --git a/src/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java b/src/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java index 2d4f189a6d..3ab56a89a5 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java +++ b/src/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java @@ -7,10 +7,10 @@ import android.graphics.Paint; import android.graphics.Point; import android.graphics.PointF; import android.graphics.RectF; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.view.GestureDetectorCompat; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.view.GestureDetectorCompat; import android.util.AttributeSet; import android.view.GestureDetector; import android.view.MotionEvent; diff --git a/src/org/thoughtcrime/securesms/imageeditor/Renderer.java b/src/org/thoughtcrime/securesms/imageeditor/Renderer.java index 0b4ff672b3..bec1eae9ef 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/Renderer.java +++ b/src/org/thoughtcrime/securesms/imageeditor/Renderer.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.imageeditor; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Responsible for rendering a single {@link org.thoughtcrime.securesms.imageeditor.model.EditorElement} to the canvas. diff --git a/src/org/thoughtcrime/securesms/imageeditor/RendererContext.java b/src/org/thoughtcrime/securesms/imageeditor/RendererContext.java index d133e8f6c1..0883d6fcd1 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/RendererContext.java +++ b/src/org/thoughtcrime/securesms/imageeditor/RendererContext.java @@ -5,8 +5,8 @@ import android.graphics.Canvas; import android.graphics.Matrix; import android.graphics.Point; import android.graphics.RectF; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; /** * Contains all of the information required for a {@link Renderer} to do its job. diff --git a/src/org/thoughtcrime/securesms/imageeditor/ThumbDragEditSession.java b/src/org/thoughtcrime/securesms/imageeditor/ThumbDragEditSession.java index 7a1217978a..860883e568 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/ThumbDragEditSession.java +++ b/src/org/thoughtcrime/securesms/imageeditor/ThumbDragEditSession.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.imageeditor; import android.graphics.Matrix; import android.graphics.PointF; -import android.graphics.RectF; -import android.support.annotation.NonNull; + +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.imageeditor.model.EditorElement; import org.thoughtcrime.securesms.imageeditor.model.ThumbRenderer; diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/AlphaAnimation.java b/src/org/thoughtcrime/securesms/imageeditor/model/AlphaAnimation.java index 0a2c24d32e..6aae9f88a1 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/model/AlphaAnimation.java +++ b/src/org/thoughtcrime/securesms/imageeditor/model/AlphaAnimation.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.imageeditor.model; import android.animation.ValueAnimator; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.animation.Interpolator; import android.view.animation.LinearInterpolator; diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/AnimationMatrix.java b/src/org/thoughtcrime/securesms/imageeditor/model/AnimationMatrix.java index 712f52d110..ea499c69c5 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/model/AnimationMatrix.java +++ b/src/org/thoughtcrime/securesms/imageeditor/model/AnimationMatrix.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.imageeditor.model; import android.animation.ValueAnimator; import android.graphics.Matrix; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.animation.CycleInterpolator; import android.view.animation.DecelerateInterpolator; import android.view.animation.Interpolator; diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/Bisect.java b/src/org/thoughtcrime/securesms/imageeditor/model/Bisect.java index 2a3add5caf..22c4559238 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/model/Bisect.java +++ b/src/org/thoughtcrime/securesms/imageeditor/model/Bisect.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.imageeditor.model; import android.graphics.Matrix; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; final class Bisect { diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/CropThumbRenderer.java b/src/org/thoughtcrime/securesms/imageeditor/model/CropThumbRenderer.java index c6df34eabe..c752ffaeaf 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/model/CropThumbRenderer.java +++ b/src/org/thoughtcrime/securesms/imageeditor/model/CropThumbRenderer.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.imageeditor.model; import android.graphics.Matrix; import android.os.Parcel; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import network.loki.messenger.R; import org.thoughtcrime.securesms.imageeditor.Bounds; diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/EditorElement.java b/src/org/thoughtcrime/securesms/imageeditor/model/EditorElement.java index 2f2312c9f6..9460907f90 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/model/EditorElement.java +++ b/src/org/thoughtcrime/securesms/imageeditor/model/EditorElement.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.imageeditor.model; import android.graphics.Matrix; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.imageeditor.Renderer; import org.thoughtcrime.securesms.imageeditor.RendererContext; diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/EditorElementHierarchy.java b/src/org/thoughtcrime/securesms/imageeditor/model/EditorElementHierarchy.java index e83f3a82de..0c14768a32 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/model/EditorElementHierarchy.java +++ b/src/org/thoughtcrime/securesms/imageeditor/model/EditorElementHierarchy.java @@ -4,8 +4,8 @@ import android.graphics.Matrix; import android.graphics.Point; import android.graphics.PointF; import android.graphics.RectF; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import network.loki.messenger.R; import org.thoughtcrime.securesms.imageeditor.Bounds; diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/EditorFlags.java b/src/org/thoughtcrime/securesms/imageeditor/model/EditorFlags.java index 5887f8540b..6d5020ce87 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/model/EditorFlags.java +++ b/src/org/thoughtcrime/securesms/imageeditor/model/EditorFlags.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.imageeditor.model; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Flags for an {@link EditorElement}. diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/EditorModel.java b/src/org/thoughtcrime/securesms/imageeditor/model/EditorModel.java index 9e56f0d32c..6ee09d63e1 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/model/EditorModel.java +++ b/src/org/thoughtcrime/securesms/imageeditor/model/EditorModel.java @@ -9,9 +9,9 @@ import android.graphics.PointF; import android.graphics.RectF; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import org.thoughtcrime.securesms.imageeditor.Bounds; import org.thoughtcrime.securesms.imageeditor.ColorableRenderer; diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/ElementStack.java b/src/org/thoughtcrime/securesms/imageeditor/model/ElementStack.java index 4eb8aa609e..468e288f0f 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/model/ElementStack.java +++ b/src/org/thoughtcrime/securesms/imageeditor/model/ElementStack.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.imageeditor.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.Arrays; import java.util.Stack; diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/InBoundsMemory.java b/src/org/thoughtcrime/securesms/imageeditor/model/InBoundsMemory.java index 26cb13611a..e048261efd 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/model/InBoundsMemory.java +++ b/src/org/thoughtcrime/securesms/imageeditor/model/InBoundsMemory.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.imageeditor.model; import android.graphics.Matrix; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; final class InBoundsMemory { diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/ParcelUtils.java b/src/org/thoughtcrime/securesms/imageeditor/model/ParcelUtils.java index 8ef74329d0..bf491ddd06 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/model/ParcelUtils.java +++ b/src/org/thoughtcrime/securesms/imageeditor/model/ParcelUtils.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.imageeditor.model; import android.graphics.Matrix; import android.os.Parcel; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.UUID; diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/UndoRedoStacks.java b/src/org/thoughtcrime/securesms/imageeditor/model/UndoRedoStacks.java index d7a1481ee4..8f680bdd0d 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/model/UndoRedoStacks.java +++ b/src/org/thoughtcrime/securesms/imageeditor/model/UndoRedoStacks.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.imageeditor.model; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.Arrays; diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/AutomaticControlPointBezierLine.java b/src/org/thoughtcrime/securesms/imageeditor/renderers/AutomaticControlPointBezierLine.java index 22d5a4b8c2..6b97bc3416 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/renderers/AutomaticControlPointBezierLine.java +++ b/src/org/thoughtcrime/securesms/imageeditor/renderers/AutomaticControlPointBezierLine.java @@ -5,8 +5,8 @@ import android.graphics.Paint; import android.graphics.Path; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.Arrays; diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/BezierDrawingRenderer.java b/src/org/thoughtcrime/securesms/imageeditor/renderers/BezierDrawingRenderer.java index 6259e794b4..c69cb452e1 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/renderers/BezierDrawingRenderer.java +++ b/src/org/thoughtcrime/securesms/imageeditor/renderers/BezierDrawingRenderer.java @@ -5,8 +5,8 @@ import android.graphics.Paint; import android.graphics.PointF; import android.graphics.RectF; import android.os.Parcel; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.imageeditor.ColorableRenderer; import org.thoughtcrime.securesms.imageeditor.RendererContext; diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/CropAreaRenderer.java b/src/org/thoughtcrime/securesms/imageeditor/renderers/CropAreaRenderer.java index a34876b724..537fcf9700 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/renderers/CropAreaRenderer.java +++ b/src/org/thoughtcrime/securesms/imageeditor/renderers/CropAreaRenderer.java @@ -6,9 +6,9 @@ import android.graphics.Paint; import android.graphics.Path; import android.graphics.RectF; import android.os.Parcel; -import android.support.annotation.ColorRes; -import android.support.annotation.NonNull; -import android.support.v4.content.res.ResourcesCompat; +import androidx.annotation.ColorRes; +import androidx.annotation.NonNull; +import androidx.core.content.res.ResourcesCompat; import network.loki.messenger.R; import org.thoughtcrime.securesms.imageeditor.Bounds; diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/InvalidateableRenderer.java b/src/org/thoughtcrime/securesms/imageeditor/renderers/InvalidateableRenderer.java index 88c5549d0c..fd255e4d2c 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/renderers/InvalidateableRenderer.java +++ b/src/org/thoughtcrime/securesms/imageeditor/renderers/InvalidateableRenderer.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.imageeditor.renderers; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.imageeditor.Renderer; import org.thoughtcrime.securesms.imageeditor.RendererContext; diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/InverseFillRenderer.java b/src/org/thoughtcrime/securesms/imageeditor/renderers/InverseFillRenderer.java index c7bba78f4b..6c662e9d18 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/renderers/InverseFillRenderer.java +++ b/src/org/thoughtcrime/securesms/imageeditor/renderers/InverseFillRenderer.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.imageeditor.renderers; import android.graphics.Path; import android.os.Parcel; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.imageeditor.Bounds; import org.thoughtcrime.securesms.imageeditor.Renderer; diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/TextRenderer.java b/src/org/thoughtcrime/securesms/imageeditor/renderers/TextRenderer.java index 3b79097b80..b32823f9a0 100644 --- a/src/org/thoughtcrime/securesms/imageeditor/renderers/TextRenderer.java +++ b/src/org/thoughtcrime/securesms/imageeditor/renderers/TextRenderer.java @@ -8,9 +8,9 @@ import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Typeface; import android.os.Parcel; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.animation.Interpolator; import org.thoughtcrime.securesms.imageeditor.Bounds; diff --git a/src/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java b/src/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java index e4e7413f7c..023be74017 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java +++ b/src/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java @@ -6,7 +6,7 @@ import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/jobmanager/CompositeScheduler.java b/src/org/thoughtcrime/securesms/jobmanager/CompositeScheduler.java index f4844651af..322366f4f4 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/CompositeScheduler.java +++ b/src/org/thoughtcrime/securesms/jobmanager/CompositeScheduler.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobmanager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.Arrays; import java.util.List; diff --git a/src/org/thoughtcrime/securesms/jobmanager/Constraint.java b/src/org/thoughtcrime/securesms/jobmanager/Constraint.java index 5ee9b7ece4..854804d746 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/Constraint.java +++ b/src/org/thoughtcrime/securesms/jobmanager/Constraint.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.jobmanager; import android.app.job.JobInfo; -import android.support.annotation.NonNull; -import android.support.annotation.RequiresApi; +import androidx.annotation.NonNull; +import androidx.annotation.RequiresApi; public interface Constraint { diff --git a/src/org/thoughtcrime/securesms/jobmanager/ConstraintInstantiator.java b/src/org/thoughtcrime/securesms/jobmanager/ConstraintInstantiator.java index 2b41f4051b..b0a67e3d19 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/ConstraintInstantiator.java +++ b/src/org/thoughtcrime/securesms/jobmanager/ConstraintInstantiator.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobmanager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.HashMap; import java.util.Map; diff --git a/src/org/thoughtcrime/securesms/jobmanager/ConstraintObserver.java b/src/org/thoughtcrime/securesms/jobmanager/ConstraintObserver.java index f870496e64..fd7f4fd43c 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/ConstraintObserver.java +++ b/src/org/thoughtcrime/securesms/jobmanager/ConstraintObserver.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobmanager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public interface ConstraintObserver { diff --git a/src/org/thoughtcrime/securesms/jobmanager/Data.java b/src/org/thoughtcrime/securesms/jobmanager/Data.java index a55069ec38..72e8508a5b 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/Data.java +++ b/src/org/thoughtcrime/securesms/jobmanager/Data.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobmanager; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/org/thoughtcrime/securesms/jobmanager/ExecutorFactory.java b/src/org/thoughtcrime/securesms/jobmanager/ExecutorFactory.java index a86c99135a..b0c2b974de 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/ExecutorFactory.java +++ b/src/org/thoughtcrime/securesms/jobmanager/ExecutorFactory.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobmanager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.concurrent.ExecutorService; diff --git a/src/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java b/src/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java index 585b262adf..1b055584ea 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java +++ b/src/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobmanager; import android.os.Handler; import android.os.HandlerThread; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/jobmanager/Job.java b/src/org/thoughtcrime/securesms/jobmanager/Job.java index 2f5d4a19c3..dfcc087208 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/Job.java +++ b/src/org/thoughtcrime/securesms/jobmanager/Job.java @@ -1,9 +1,9 @@ package org.thoughtcrime.securesms.jobmanager; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import org.thoughtcrime.securesms.logging.Log; diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobController.java b/src/org/thoughtcrime/securesms/jobmanager/JobController.java index d9f910ba91..6294e3725e 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/JobController.java +++ b/src/org/thoughtcrime/securesms/jobmanager/JobController.java @@ -1,9 +1,9 @@ package org.thoughtcrime.securesms.jobmanager; import android.app.Application; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobInstantiator.java b/src/org/thoughtcrime/securesms/jobmanager/JobInstantiator.java index c1166de756..37cba5e422 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/JobInstantiator.java +++ b/src/org/thoughtcrime/securesms/jobmanager/JobInstantiator.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobmanager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.HashMap; import java.util.Map; diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobLogger.java b/src/org/thoughtcrime/securesms/jobmanager/JobLogger.java index dd5e612f56..c35f6dc1ac 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/JobLogger.java +++ b/src/org/thoughtcrime/securesms/jobmanager/JobLogger.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobmanager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; public class JobLogger { diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobManager.java b/src/org/thoughtcrime/securesms/jobmanager/JobManager.java index 1ab2cb6b09..636faa04fb 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/JobManager.java +++ b/src/org/thoughtcrime/securesms/jobmanager/JobManager.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.jobmanager; import android.app.Application; import android.content.Intent; import android.os.Build; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.jobmanager.impl.DefaultExecutorFactory; import org.thoughtcrime.securesms.jobmanager.impl.JsonDataSerializer; diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobRunner.java b/src/org/thoughtcrime/securesms/jobmanager/JobRunner.java index 7c67dc3394..a2cf5d2079 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/JobRunner.java +++ b/src/org/thoughtcrime/securesms/jobmanager/JobRunner.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobmanager; import android.app.Application; import android.os.PowerManager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java b/src/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java index 77a1f9a7bb..d3e3f4877e 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java +++ b/src/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java @@ -8,8 +8,8 @@ import android.app.job.JobService; import android.content.ComponentName; import android.content.Context; import android.content.SharedPreferences; -import android.support.annotation.NonNull; -import android.support.annotation.RequiresApi; +import androidx.annotation.NonNull; +import androidx.annotation.RequiresApi; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.logging.Log; diff --git a/src/org/thoughtcrime/securesms/jobmanager/KeepAliveService.java b/src/org/thoughtcrime/securesms/jobmanager/KeepAliveService.java index ccc1aa234c..121686671c 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/KeepAliveService.java +++ b/src/org/thoughtcrime/securesms/jobmanager/KeepAliveService.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.jobmanager; import android.app.Service; import android.content.Intent; import android.os.IBinder; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; /** * Service that keeps the application in memory while the app is closed. diff --git a/src/org/thoughtcrime/securesms/jobmanager/Scheduler.java b/src/org/thoughtcrime/securesms/jobmanager/Scheduler.java index fb276cfe2d..194acd39b2 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/Scheduler.java +++ b/src/org/thoughtcrime/securesms/jobmanager/Scheduler.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobmanager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.List; diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraint.java b/src/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraint.java index 5fb9997361..6d6fc0499f 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraint.java +++ b/src/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraint.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobmanager.impl; import android.app.Application; import android.app.job.JobInfo; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.jobmanager.Constraint; import org.thoughtcrime.securesms.sms.TelephonyServiceState; diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraintObserver.java b/src/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraintObserver.java index dfd1b9c714..fd0971dc57 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraintObserver.java +++ b/src/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraintObserver.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobmanager.impl; import android.app.Application; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.telephony.PhoneStateListener; import android.telephony.ServiceState; import android.telephony.TelephonyManager; diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory.java b/src/org/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory.java index 91c72474c8..a9d4591009 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory.java +++ b/src/org/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobmanager.impl; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.jobmanager.ExecutorFactory; diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java b/src/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java index fbabab82fa..95ab7e19c3 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java +++ b/src/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobmanager.impl; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.jobmanager.Data; import org.thoughtcrime.securesms.logging.Log; diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java b/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java index 1252e4da6e..1546883b85 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java +++ b/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java @@ -5,8 +5,8 @@ import android.app.job.JobInfo; import android.content.Context; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import android.support.annotation.NonNull; -import android.support.annotation.RequiresApi; +import androidx.annotation.NonNull; +import androidx.annotation.RequiresApi; import org.thoughtcrime.securesms.jobmanager.Constraint; diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraintObserver.java b/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraintObserver.java index fd99ae367d..ef4a61c7c5 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraintObserver.java +++ b/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraintObserver.java @@ -6,7 +6,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.net.ConnectivityManager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.jobmanager.ConstraintObserver; diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkOrCellServiceConstraint.java b/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkOrCellServiceConstraint.java index 565f69c30b..c17931f977 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkOrCellServiceConstraint.java +++ b/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkOrCellServiceConstraint.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobmanager.impl; import android.app.Application; import android.app.job.JobInfo; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.jobmanager.Constraint; diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraint.java b/src/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraint.java index d3bb5c9268..8e0c230c01 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraint.java +++ b/src/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraint.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobmanager.impl; import android.app.Application; import android.app.job.JobInfo; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.jobmanager.Constraint; import org.thoughtcrime.securesms.util.TextSecurePreferences; diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraintObserver.java b/src/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraintObserver.java index 96b858e9da..0c9225434d 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraintObserver.java +++ b/src/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraintObserver.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobmanager.impl; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/src/org/thoughtcrime/securesms/jobmanager/migration/DataMigrator.java b/src/org/thoughtcrime/securesms/jobmanager/migration/DataMigrator.java index d04f765d6a..6d3d270998 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/migration/DataMigrator.java +++ b/src/org/thoughtcrime/securesms/jobmanager/migration/DataMigrator.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobmanager.migration; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.jobmanager.Data; import org.thoughtcrime.securesms.logging.Log; diff --git a/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerDatabase.java b/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerDatabase.java index 2f4696a283..81226fc976 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerDatabase.java +++ b/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerDatabase.java @@ -4,8 +4,8 @@ import android.content.Context; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.jobmanager.Data; import org.thoughtcrime.securesms.jobmanager.Job; diff --git a/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerFactoryMappings.java b/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerFactoryMappings.java index 04bb55eca4..ff58bd2899 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerFactoryMappings.java +++ b/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerFactoryMappings.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobmanager.migration; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.jobs.AttachmentDownloadJob; import org.thoughtcrime.securesms.jobs.AttachmentUploadJob; diff --git a/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerMigrator.java b/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerMigrator.java index 1bc7fcc96f..ae7df8eb9a 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerMigrator.java +++ b/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerMigrator.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.jobmanager.migration; import android.annotation.SuppressLint; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.WorkerThread; import org.thoughtcrime.securesms.jobmanager.Data; import org.thoughtcrime.securesms.jobmanager.persistence.FullSpec; diff --git a/src/org/thoughtcrime/securesms/jobmanager/persistence/ConstraintSpec.java b/src/org/thoughtcrime/securesms/jobmanager/persistence/ConstraintSpec.java index 8bec3a7030..1dab10ae56 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/persistence/ConstraintSpec.java +++ b/src/org/thoughtcrime/securesms/jobmanager/persistence/ConstraintSpec.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobmanager.persistence; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.Objects; diff --git a/src/org/thoughtcrime/securesms/jobmanager/persistence/DependencySpec.java b/src/org/thoughtcrime/securesms/jobmanager/persistence/DependencySpec.java index 644c4d1223..2faea0485b 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/persistence/DependencySpec.java +++ b/src/org/thoughtcrime/securesms/jobmanager/persistence/DependencySpec.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobmanager.persistence; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.Objects; diff --git a/src/org/thoughtcrime/securesms/jobmanager/persistence/FullSpec.java b/src/org/thoughtcrime/securesms/jobmanager/persistence/FullSpec.java index 1a70a9eea4..f93c0e64bd 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/persistence/FullSpec.java +++ b/src/org/thoughtcrime/securesms/jobmanager/persistence/FullSpec.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobmanager.persistence; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.List; import java.util.Objects; diff --git a/src/org/thoughtcrime/securesms/jobmanager/persistence/JobSpec.java b/src/org/thoughtcrime/securesms/jobmanager/persistence/JobSpec.java index d73fa8cfb7..d5f5cd5b3e 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/persistence/JobSpec.java +++ b/src/org/thoughtcrime/securesms/jobmanager/persistence/JobSpec.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.jobmanager.persistence; import android.annotation.SuppressLint; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.Objects; diff --git a/src/org/thoughtcrime/securesms/jobmanager/persistence/JobStorage.java b/src/org/thoughtcrime/securesms/jobmanager/persistence/JobStorage.java index 92d6fd31f2..b7c035ac60 100644 --- a/src/org/thoughtcrime/securesms/jobmanager/persistence/JobStorage.java +++ b/src/org/thoughtcrime/securesms/jobmanager/persistence/JobStorage.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.jobmanager.persistence; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import java.util.List; diff --git a/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java b/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java index 5b34dc2f71..0a8b734d43 100644 --- a/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java +++ b/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; -import android.support.annotation.VisibleForTesting; +import androidx.annotation.NonNull; +import androidx.annotation.VisibleForTesting; import android.text.TextUtils; import org.greenrobot.eventbus.EventBus; @@ -18,7 +18,6 @@ import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.MmsException; -import org.thoughtcrime.securesms.notifications.MessageNotifier; import org.thoughtcrime.securesms.util.AttachmentUtil; import org.thoughtcrime.securesms.util.Base64; import org.thoughtcrime.securesms.util.Hex; diff --git a/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java b/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java index 99f5b1c7d5..f1c721718c 100644 --- a/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java +++ b/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.greenrobot.eventbus.EventBus; import org.thoughtcrime.securesms.attachments.Attachment; diff --git a/src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java b/src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java index 77e4e1c883..0b2db43157 100644 --- a/src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java +++ b/src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; import android.graphics.Bitmap; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.GroupDatabase; @@ -14,7 +14,6 @@ import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.AttachmentStreamUriLoader.AttachmentModel; import org.thoughtcrime.securesms.util.BitmapDecodingException; import org.thoughtcrime.securesms.util.BitmapUtil; -import org.thoughtcrime.securesms.util.GroupUtil; import org.thoughtcrime.securesms.util.Hex; import org.whispersystems.libsignal.InvalidMessageException; import org.whispersystems.libsignal.util.guava.Optional; diff --git a/src/org/thoughtcrime/securesms/jobs/BaseJob.java b/src/org/thoughtcrime/securesms/jobs/BaseJob.java index 9d4e76b032..73053b0479 100644 --- a/src/org/thoughtcrime/securesms/jobs/BaseJob.java +++ b/src/org/thoughtcrime/securesms/jobs/BaseJob.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.JobLogger; diff --git a/src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java b/src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java index 987ce6e787..2d427a35aa 100644 --- a/src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java +++ b/src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.jobmanager.Data; import org.thoughtcrime.securesms.jobmanager.Job; diff --git a/src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java b/src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java index 28a866611b..0b56da982d 100644 --- a/src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java +++ b/src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.crypto.IdentityKeyUtil; import org.thoughtcrime.securesms.crypto.PreKeyUtil; diff --git a/src/org/thoughtcrime/securesms/jobs/FastJobStorage.java b/src/org/thoughtcrime/securesms/jobs/FastJobStorage.java index 90a3243aed..38cf051455 100644 --- a/src/org/thoughtcrime/securesms/jobs/FastJobStorage.java +++ b/src/org/thoughtcrime/securesms/jobs/FastJobStorage.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/jobs/JobManagerFactories.java b/src/org/thoughtcrime/securesms/jobs/JobManagerFactories.java index 41b31fd332..798b7bb17e 100644 --- a/src/org/thoughtcrime/securesms/jobs/JobManagerFactories.java +++ b/src/org/thoughtcrime/securesms/jobs/JobManagerFactories.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; import android.app.Application; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.jobmanager.Constraint; import org.thoughtcrime.securesms.jobmanager.ConstraintObserver; diff --git a/src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java b/src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java index 0e750d8a18..dc0d8b1f4b 100644 --- a/src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java +++ b/src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobs; import android.Manifest; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.backup.BackupPassphrase; import org.thoughtcrime.securesms.backup.FullBackupExporter; diff --git a/src/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java b/src/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java index 5b1d81abcc..b8430d0fac 100644 --- a/src/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.jobs; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.android.mms.pdu_alt.CharacterSets; import com.google.android.mms.pdu_alt.EncodedStringValue; diff --git a/src/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java b/src/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java index 5cda9e2151..1dee3ff330 100644 --- a/src/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java @@ -4,7 +4,7 @@ import org.thoughtcrime.securesms.jobmanager.Data; import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.logging.Log; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Pair; import com.google.android.mms.pdu_alt.GenericPdu; diff --git a/src/org/thoughtcrime/securesms/jobs/MmsSendJob.java b/src/org/thoughtcrime/securesms/jobs/MmsSendJob.java index e3005573e3..5ca2d33dc3 100644 --- a/src/org/thoughtcrime/securesms/jobs/MmsSendJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MmsSendJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.webkit.MimeTypeMap; @@ -36,7 +36,6 @@ import org.thoughtcrime.securesms.mms.MmsException; import org.thoughtcrime.securesms.mms.MmsSendResult; import org.thoughtcrime.securesms.mms.OutgoingMediaMessage; import org.thoughtcrime.securesms.mms.PartAuthority; -import org.thoughtcrime.securesms.notifications.MessageNotifier; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.transport.InsecureFallbackApprovalException; import org.thoughtcrime.securesms.transport.UndeliverableMessageException; diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java index ce7e9c53e2..869cdce96d 100644 --- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java index d0da9d6bc9..d464b0612b 100644 --- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.dependencies.InjectableType; diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java index 184c515c12..367f7463c5 100644 --- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; import android.net.Uri; import android.provider.ContactsContract; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.contacts.ContactAccessor.ContactData; diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java index c35d6b8e3a..25d05daaee 100644 --- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.database.Address; diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java index dfcee1093b..8283e6236a 100644 --- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.jobmanager.Data; import org.thoughtcrime.securesms.jobmanager.Job; diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java index ecf18ec362..cb203e132f 100644 --- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.annimon.stream.Stream; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java index f30a353f5e..bbc76baf4c 100644 --- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.dependencies.InjectableType; import org.thoughtcrime.securesms.jobmanager.Data; diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java index f918659446..2c4a47670b 100644 --- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.dependencies.InjectableType; import org.thoughtcrime.securesms.jobmanager.Data; diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java index 81e6299e2c..e43a67cb1e 100644 --- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.IdentityDatabase.VerifiedStatus; diff --git a/src/org/thoughtcrime/securesms/jobs/PushContentReceiveJob.java b/src/org/thoughtcrime/securesms/jobs/PushContentReceiveJob.java index 79ad58f618..3032093e49 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushContentReceiveJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushContentReceiveJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.jobmanager.Data; import org.thoughtcrime.securesms.jobmanager.Job; diff --git a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java index cc6445c532..4ce544efb2 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java @@ -5,10 +5,10 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.NotificationManagerCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationManagerCompat; import android.text.TextUtils; import android.util.Pair; diff --git a/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java index f240ec24a2..5b7d64dac8 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java @@ -1,9 +1,9 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import com.annimon.stream.Collectors; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java index adb49eba35..38576e415b 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.database.Address; diff --git a/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java index 3a70c4fc18..251e23a879 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.WorkerThread; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java b/src/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java index 3d38c1c833..e053b12cb7 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.dependencies.InjectableType; import org.thoughtcrime.securesms.jobmanager.Data; diff --git a/src/org/thoughtcrime/securesms/jobs/PushReceivedJob.java b/src/org/thoughtcrime/securesms/jobs/PushReceivedJob.java index 34570b169d..e506d993e9 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushReceivedJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushReceivedJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; import android.annotation.SuppressLint; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/src/org/thoughtcrime/securesms/jobs/PushSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushSendJob.java index b3551572fe..201e3c672f 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushSendJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushSendJob.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; import android.graphics.Bitmap; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.annimon.stream.Stream; @@ -24,7 +24,6 @@ import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader; import org.thoughtcrime.securesms.mms.OutgoingMediaMessage; import org.thoughtcrime.securesms.mms.PartAuthority; -import org.thoughtcrime.securesms.notifications.MessageNotifier; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.Base64; import org.thoughtcrime.securesms.util.BitmapDecodingException; diff --git a/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java index 6e28d4163c..97d4572a40 100644 --- a/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java +++ b/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import org.thoughtcrime.securesms.ApplicationContext; diff --git a/src/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java b/src/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java index 9ed1639180..129f35d9a5 100644 --- a/src/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java +++ b/src/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.jobmanager.Data; diff --git a/src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java b/src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java index 24518c5eb9..0ee0daf98d 100644 --- a/src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java +++ b/src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.dependencies.InjectableType; import org.thoughtcrime.securesms.jobmanager.Data; diff --git a/src/org/thoughtcrime/securesms/jobs/RefreshUnidentifiedDeliveryAbilityJob.java b/src/org/thoughtcrime/securesms/jobs/RefreshUnidentifiedDeliveryAbilityJob.java index 1b6c87599a..6fd616168b 100644 --- a/src/org/thoughtcrime/securesms/jobs/RefreshUnidentifiedDeliveryAbilityJob.java +++ b/src/org/thoughtcrime/securesms/jobs/RefreshUnidentifiedDeliveryAbilityJob.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.crypto.ProfileKeyUtil; import org.thoughtcrime.securesms.dependencies.InjectableType; diff --git a/src/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java b/src/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java index bb9cc72d91..ae6acec2cf 100644 --- a/src/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java +++ b/src/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.database.Address; diff --git a/src/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java b/src/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java index 9c574bd6ea..48bc091e97 100644 --- a/src/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java +++ b/src/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobs; import android.app.Application; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import org.thoughtcrime.securesms.database.Address; diff --git a/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java b/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java index 25ed74dbb0..c3febc4fe8 100644 --- a/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java +++ b/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobs; import android.app.Application; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import org.thoughtcrime.securesms.ApplicationContext; diff --git a/src/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java b/src/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java index 3caf337f5f..087b783845 100644 --- a/src/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java +++ b/src/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobs; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.dependencies.InjectableType; import org.thoughtcrime.securesms.jobmanager.Data; diff --git a/src/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java b/src/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java index 6f65e21077..56586c7a88 100644 --- a/src/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java +++ b/src/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.crypto.ProfileKeyUtil; diff --git a/src/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java b/src/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java index c8d0932ec5..5ab4a0d6d0 100644 --- a/src/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java +++ b/src/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.crypto.IdentityKeyUtil; diff --git a/src/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java b/src/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java index fa589cd5ac..dead5266cd 100644 --- a/src/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java +++ b/src/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.database.Address; diff --git a/src/org/thoughtcrime/securesms/jobs/SendJob.java b/src/org/thoughtcrime/securesms/jobs/SendJob.java index c8a1f49939..5c0b6b480f 100644 --- a/src/org/thoughtcrime/securesms/jobs/SendJob.java +++ b/src/org/thoughtcrime/securesms/jobs/SendJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import network.loki.messenger.BuildConfig; import org.thoughtcrime.securesms.TextSecureExpiredException; diff --git a/src/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java b/src/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java index da08f5aa1f..24692eb026 100644 --- a/src/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java +++ b/src/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.database.Address; diff --git a/src/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java b/src/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java index 1a83a580e3..4669365a97 100644 --- a/src/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java +++ b/src/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.greenrobot.eventbus.EventBus; import org.thoughtcrime.securesms.events.ReminderUpdateEvent; diff --git a/src/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java b/src/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java index e6463eb11e..d1032e5962 100644 --- a/src/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java +++ b/src/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.telephony.SmsMessage; import org.thoughtcrime.securesms.ApplicationContext; @@ -13,7 +13,6 @@ import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MessagingDatabase.InsertResult; import org.thoughtcrime.securesms.database.SmsDatabase; -import org.thoughtcrime.securesms.notifications.MessageNotifier; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.sms.IncomingTextMessage; import org.thoughtcrime.securesms.util.Base64; diff --git a/src/org/thoughtcrime/securesms/jobs/SmsSendJob.java b/src/org/thoughtcrime/securesms/jobs/SmsSendJob.java index ed4ebcfdf4..f4cf0be170 100644 --- a/src/org/thoughtcrime/securesms/jobs/SmsSendJob.java +++ b/src/org/thoughtcrime/securesms/jobs/SmsSendJob.java @@ -5,7 +5,7 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Build; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.telephony.PhoneNumberUtils; import android.telephony.SmsManager; @@ -19,7 +19,6 @@ import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.NoSuchMessageException; import org.thoughtcrime.securesms.database.SmsDatabase; import org.thoughtcrime.securesms.database.model.SmsMessageRecord; -import org.thoughtcrime.securesms.notifications.MessageNotifier; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.service.SmsDeliveryListener; import org.thoughtcrime.securesms.transport.UndeliverableMessageException; diff --git a/src/org/thoughtcrime/securesms/jobs/SmsSentJob.java b/src/org/thoughtcrime/securesms/jobs/SmsSentJob.java index 43fc8d4170..bf2420f0c1 100644 --- a/src/org/thoughtcrime/securesms/jobs/SmsSentJob.java +++ b/src/org/thoughtcrime/securesms/jobs/SmsSentJob.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.jobs; import android.app.Activity; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.telephony.SmsManager; import org.thoughtcrime.securesms.jobmanager.Data; @@ -13,7 +13,6 @@ import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.NoSuchMessageException; import org.thoughtcrime.securesms.database.SmsDatabase; import org.thoughtcrime.securesms.database.model.SmsMessageRecord; -import org.thoughtcrime.securesms.notifications.MessageNotifier; import org.thoughtcrime.securesms.service.SmsDeliveryListener; public class SmsSentJob extends BaseJob { diff --git a/src/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java b/src/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java index b9e1bbc388..4919ae9536 100644 --- a/src/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java +++ b/src/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.StickerDatabase; diff --git a/src/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java b/src/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java index 6e7b6d703c..166afbc3fc 100644 --- a/src/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java +++ b/src/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/src/org/thoughtcrime/securesms/jobs/TrimThreadJob.java b/src/org/thoughtcrime/securesms/jobs/TrimThreadJob.java index 95be3090b5..fa28603a7a 100644 --- a/src/org/thoughtcrime/securesms/jobs/TrimThreadJob.java +++ b/src/org/thoughtcrime/securesms/jobs/TrimThreadJob.java @@ -16,7 +16,7 @@ */ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.jobmanager.Data; diff --git a/src/org/thoughtcrime/securesms/jobs/TypingSendJob.java b/src/org/thoughtcrime/securesms/jobs/TypingSendJob.java index 51015297f7..fcc34e2150 100644 --- a/src/org/thoughtcrime/securesms/jobs/TypingSendJob.java +++ b/src/org/thoughtcrime/securesms/jobs/TypingSendJob.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/jobs/UpdateApkJob.java b/src/org/thoughtcrime/securesms/jobs/UpdateApkJob.java index 4a0359c967..9ac7cea4b3 100644 --- a/src/org/thoughtcrime/securesms/jobs/UpdateApkJob.java +++ b/src/org/thoughtcrime/securesms/jobs/UpdateApkJob.java @@ -8,8 +8,8 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.database.Cursor; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/org/thoughtcrime/securesms/linkpreview/LinkPreview.java b/src/org/thoughtcrime/securesms/linkpreview/LinkPreview.java index 35b3634c78..9daa346ea6 100644 --- a/src/org/thoughtcrime/securesms/linkpreview/LinkPreview.java +++ b/src/org/thoughtcrime/securesms/linkpreview/LinkPreview.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.linkpreview; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java b/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java index c213963d75..fc931c0545 100644 --- a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java +++ b/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.linkpreview; import android.content.Context; import android.graphics.Bitmap; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.Html; import android.text.TextUtils; diff --git a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java b/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java index 9eab5a1e03..9139f67ca0 100644 --- a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java +++ b/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.linkpreview; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.SpannableString; import android.text.TextUtils; import android.text.style.URLSpan; diff --git a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java b/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java index a7231a44b1..163d5e73be 100644 --- a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java +++ b/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java @@ -1,11 +1,11 @@ package org.thoughtcrime.securesms.linkpreview; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.MutableLiveData; -import android.arch.lifecycle.ViewModel; -import android.arch.lifecycle.ViewModelProvider; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; +import androidx.lifecycle.ViewModelProvider; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import org.thoughtcrime.securesms.net.RequestController; diff --git a/src/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java b/src/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java index ae8408e247..7dc4f2c296 100644 --- a/src/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java +++ b/src/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java @@ -6,8 +6,8 @@ import android.content.Context; import android.graphics.Typeface; import android.os.AsyncTask; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; import android.text.Editable; import android.text.SpannableString; import android.text.SpannableStringBuilder; diff --git a/src/org/thoughtcrime/securesms/lock/RegistrationLockReminders.java b/src/org/thoughtcrime/securesms/lock/RegistrationLockReminders.java index 8df9fa0d6f..d000870cdb 100644 --- a/src/org/thoughtcrime/securesms/lock/RegistrationLockReminders.java +++ b/src/org/thoughtcrime/securesms/lock/RegistrationLockReminders.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.lock; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.util.TextSecurePreferences; diff --git a/src/org/thoughtcrime/securesms/logging/Log.java b/src/org/thoughtcrime/securesms/logging/Log.java index 31dc299227..ea4e106861 100644 --- a/src/org/thoughtcrime/securesms/logging/Log.java +++ b/src/org/thoughtcrime/securesms/logging/Log.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.logging; -import android.support.annotation.MainThread; +import androidx.annotation.MainThread; public class Log { diff --git a/src/org/thoughtcrime/securesms/logging/LogFile.java b/src/org/thoughtcrime/securesms/logging/LogFile.java index 2f2bd43910..8fbf8c3a78 100644 --- a/src/org/thoughtcrime/securesms/logging/LogFile.java +++ b/src/org/thoughtcrime/securesms/logging/LogFile.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.logging; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.util.Conversions; import org.thoughtcrime.securesms.util.Util; @@ -12,8 +12,6 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; -import java.io.PushbackInputStream; -import java.io.RandomAccessFile; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; diff --git a/src/org/thoughtcrime/securesms/logging/LogSecretProvider.java b/src/org/thoughtcrime/securesms/logging/LogSecretProvider.java index e180a08842..e3b13dfaac 100644 --- a/src/org/thoughtcrime/securesms/logging/LogSecretProvider.java +++ b/src/org/thoughtcrime/securesms/logging/LogSecretProvider.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.logging; import android.content.Context; import android.os.Build; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.crypto.KeyStoreHelper; import org.thoughtcrime.securesms.util.Base64; diff --git a/src/org/thoughtcrime/securesms/logging/PersistentLogger.java b/src/org/thoughtcrime/securesms/logging/PersistentLogger.java index 334df55762..17b541a990 100644 --- a/src/org/thoughtcrime/securesms/logging/PersistentLogger.java +++ b/src/org/thoughtcrime/securesms/logging/PersistentLogger.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.logging; import android.content.Context; -import android.support.annotation.AnyThread; -import android.support.annotation.WorkerThread; +import androidx.annotation.AnyThread; +import androidx.annotation.WorkerThread; import org.thoughtcrime.securesms.database.NoExternalStorageException; import org.thoughtcrime.securesms.util.concurrent.ListenableFuture; diff --git a/src/org/thoughtcrime/securesms/logging/UncaughtExceptionLogger.java b/src/org/thoughtcrime/securesms/logging/UncaughtExceptionLogger.java index 642703695a..0196132108 100644 --- a/src/org/thoughtcrime/securesms/logging/UncaughtExceptionLogger.java +++ b/src/org/thoughtcrime/securesms/logging/UncaughtExceptionLogger.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.logging; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class UncaughtExceptionLogger implements Thread.UncaughtExceptionHandler { diff --git a/src/org/thoughtcrime/securesms/logsubmit/ShareIntentListAdapter.java b/src/org/thoughtcrime/securesms/logsubmit/ShareIntentListAdapter.java index ef008c3dbb..67ea859b71 100644 --- a/src/org/thoughtcrime/securesms/logsubmit/ShareIntentListAdapter.java +++ b/src/org/thoughtcrime/securesms/logsubmit/ShareIntentListAdapter.java @@ -23,7 +23,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.ResolveInfo; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java b/src/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java index 2b591de790..4900e3fb8b 100644 --- a/src/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java +++ b/src/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java @@ -31,10 +31,10 @@ import android.os.Build; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.ClipboardManager; import android.text.TextUtils; import android.text.method.LinkMovementMethod; diff --git a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt index 35855ccad7..b39c9cf93c 100644 --- a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt @@ -5,9 +5,9 @@ import android.content.Intent import android.graphics.Bitmap import android.os.AsyncTask import android.os.Bundle -import android.support.v4.app.LoaderManager -import android.support.v4.content.Loader -import android.support.v7.widget.LinearLayoutManager +import androidx.loader.app.LoaderManager +import androidx.loader.content.Loader +import androidx.recyclerview.widget.LinearLayoutManager import android.view.Menu import android.view.MenuItem import android.view.View diff --git a/src/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt index aa325d8719..41b46c8b70 100644 --- a/src/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt @@ -5,8 +5,8 @@ import android.content.ClipboardManager import android.content.Context import android.content.Intent import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentPagerAdapter +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentPagerAdapter import android.text.InputType import android.view.LayoutInflater import android.view.View @@ -136,7 +136,7 @@ class EnterPublicKeyFragment : Fragment() { private fun copyPublicKey() { val clipboard = activity!!.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager val clip = ClipData.newPlainText("Session ID", hexEncodedPublicKey) - clipboard.primaryClip = clip + clipboard.setPrimaryClip(clip) Toast.makeText(context!!, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show() } diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt index e66883325c..88c088ddb5 100644 --- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt @@ -3,9 +3,9 @@ package org.thoughtcrime.securesms.loki.activities import android.content.Context import android.content.Intent import android.os.Bundle -import android.support.v4.app.LoaderManager -import android.support.v4.content.Loader -import android.support.v7.widget.LinearLayoutManager +import androidx.loader.app.LoaderManager +import androidx.loader.content.Loader +import androidx.recyclerview.widget.LinearLayoutManager import android.view.Menu import android.view.MenuItem import android.view.View diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt index 2ea2a4b56a..384368a9dd 100644 --- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt +++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.loki.activities import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.ViewGroup import org.thoughtcrime.securesms.database.Address import org.thoughtcrime.securesms.loki.views.UserView diff --git a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt index 1c799248d9..b69f05d934 100644 --- a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.loki.activities import android.app.AlertDialog -import android.arch.lifecycle.Observer +import androidx.lifecycle.Observer import android.content.BroadcastReceiver import android.content.Context import android.content.Intent @@ -11,10 +11,10 @@ import android.net.Uri import android.os.AsyncTask import android.os.Bundle import android.os.Handler -import android.support.v4.app.LoaderManager -import android.support.v4.content.Loader -import android.support.v4.content.LocalBroadcastManager -import android.support.v7.widget.LinearLayoutManager +import androidx.loader.app.LoaderManager +import androidx.loader.content.Loader +import androidx.localbroadcastmanager.content.LocalBroadcastManager +import androidx.recyclerview.widget.LinearLayoutManager import android.text.Spannable import android.text.SpannableString import android.text.style.ForegroundColorSpan diff --git a/src/org/thoughtcrime/securesms/loki/activities/HomeAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/HomeAdapter.kt index 8ee3294207..c64d342e0a 100644 --- a/src/org/thoughtcrime/securesms/loki/activities/HomeAdapter.kt +++ b/src/org/thoughtcrime/securesms/loki/activities/HomeAdapter.kt @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.loki.activities import android.content.Context import android.database.Cursor -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.ViewGroup import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter import org.thoughtcrime.securesms.database.DatabaseFactory diff --git a/src/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt index 11f3a79b06..60b872883c 100644 --- a/src/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.loki.activities import android.animation.Animator import android.animation.AnimatorListenerAdapter import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentPagerAdapter +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentPagerAdapter import android.util.Patterns import android.view.LayoutInflater import android.view.View diff --git a/src/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt index d9d8f95da3..e80a55d832 100644 --- a/src/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.loki.activities import android.content.Intent import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentPagerAdapter +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentPagerAdapter import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/src/org/thoughtcrime/securesms/loki/activities/LinkedDevicesActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/LinkedDevicesActivity.kt index 2c4e9dabde..acd0062486 100644 --- a/src/org/thoughtcrime/securesms/loki/activities/LinkedDevicesActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/activities/LinkedDevicesActivity.kt @@ -1,10 +1,10 @@ package org.thoughtcrime.securesms.loki.activities import android.os.Bundle -import android.support.v4.app.LoaderManager -import android.support.v4.content.Loader -import android.support.v7.app.AlertDialog -import android.support.v7.widget.LinearLayoutManager +import androidx.loader.app.LoaderManager +import androidx.loader.content.Loader +import androidx.appcompat.app.AlertDialog +import androidx.recyclerview.widget.LinearLayoutManager import android.view.Menu import android.view.MenuItem import android.view.View diff --git a/src/org/thoughtcrime/securesms/loki/activities/LinkedDevicesAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/LinkedDevicesAdapter.kt index 79da843e75..03def2eccf 100644 --- a/src/org/thoughtcrime/securesms/loki/activities/LinkedDevicesAdapter.kt +++ b/src/org/thoughtcrime/securesms/loki/activities/LinkedDevicesAdapter.kt @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.loki.activities import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.ViewGroup import org.thoughtcrime.securesms.devicelist.Device import org.thoughtcrime.securesms.loki.views.DeviceView diff --git a/src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt index 5e4275d946..acbfea1366 100644 --- a/src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt @@ -5,7 +5,7 @@ import android.content.Intent import android.graphics.drawable.TransitionDrawable import android.net.Uri import android.os.Bundle -import android.support.annotation.DrawableRes +import androidx.annotation.DrawableRes import android.view.Menu import android.view.MenuItem import android.view.View diff --git a/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt index 1133865cad..b42661be1f 100644 --- a/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt @@ -7,7 +7,7 @@ import android.content.IntentFilter import android.net.Uri import android.os.Bundle import android.os.Handler -import android.support.v4.content.LocalBroadcastManager +import androidx.localbroadcastmanager.content.LocalBroadcastManager import android.util.AttributeSet import android.util.TypedValue import android.view.Gravity diff --git a/src/org/thoughtcrime/securesms/loki/activities/QRCodeActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/QRCodeActivity.kt index 34fbe29756..f7c864ad29 100644 --- a/src/org/thoughtcrime/securesms/loki/activities/QRCodeActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/activities/QRCodeActivity.kt @@ -5,8 +5,8 @@ import android.content.Intent import android.graphics.Bitmap import android.os.Bundle import android.os.Environment -import android.support.v4.app.Fragment -import android.support.v4.app.FragmentPagerAdapter +import androidx.fragment.app.Fragment +import androidx.fragment.app.FragmentPagerAdapter import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/src/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt index b78cb79308..9d5a71c85b 100644 --- a/src/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt @@ -153,7 +153,7 @@ class RegisterActivity : BaseActionBarActivity() { private fun copyPublicKey() { val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager val clip = ClipData.newPlainText("Session ID", keyPair!!.hexEncodedPublicKey) - clipboard.primaryClip = clip + clipboard.setPrimaryClip(clip) Toast.makeText(this, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show() } diff --git a/src/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt index 50f2a64b22..d0995ee019 100644 --- a/src/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt @@ -78,7 +78,7 @@ class SeedActivity : BaseActionBarActivity() { revealSeed() val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager val clip = ClipData.newPlainText("Seed", seed) - clipboard.primaryClip = clip + clipboard.setPrimaryClip(clip) Toast.makeText(this, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show() } // endregion diff --git a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt index 9292f143bd..43a0bd72c6 100644 --- a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt @@ -3,9 +3,9 @@ package org.thoughtcrime.securesms.loki.activities import android.app.Activity import android.content.Intent import android.os.Bundle -import android.support.v4.app.LoaderManager -import android.support.v4.content.Loader -import android.support.v7.widget.LinearLayoutManager +import androidx.loader.app.LoaderManager +import androidx.loader.content.Loader +import androidx.recyclerview.widget.LinearLayoutManager import android.view.Menu import android.view.MenuItem import android.view.View diff --git a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt index abe2849165..66f7e7c769 100644 --- a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt +++ b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.loki.activities import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.ViewGroup import org.thoughtcrime.securesms.database.Address import org.thoughtcrime.securesms.loki.views.UserView diff --git a/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt index c96a7d0a96..c79812b15a 100644 --- a/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt +++ b/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt @@ -226,7 +226,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() { private fun copyPublicKey() { val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager val clip = ClipData.newPlainText("Session ID", hexEncodedPublicKey) - clipboard.primaryClip = clip + clipboard.setPrimaryClip(clip) Toast.makeText(this, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show() } diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/ClearAllDataDialog.kt b/src/org/thoughtcrime/securesms/loki/dialogs/ClearAllDataDialog.kt index 0c0a405e76..42e4e0711a 100644 --- a/src/org/thoughtcrime/securesms/loki/dialogs/ClearAllDataDialog.kt +++ b/src/org/thoughtcrime/securesms/loki/dialogs/ClearAllDataDialog.kt @@ -4,8 +4,8 @@ import android.app.Dialog import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Bundle -import android.support.v4.app.DialogFragment -import android.support.v7.app.AlertDialog +import androidx.fragment.app.DialogFragment +import androidx.appcompat.app.AlertDialog import android.view.LayoutInflater import kotlinx.android.synthetic.main.dialog_clear_all_data.view.* import network.loki.messenger.R diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/ClosedGroupEditingOptionsBottomSheet.kt b/src/org/thoughtcrime/securesms/loki/dialogs/ClosedGroupEditingOptionsBottomSheet.kt index 092b37bc75..b2f62cc37f 100644 --- a/src/org/thoughtcrime/securesms/loki/dialogs/ClosedGroupEditingOptionsBottomSheet.kt +++ b/src/org/thoughtcrime/securesms/loki/dialogs/ClosedGroupEditingOptionsBottomSheet.kt @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.loki.dialogs import android.os.Bundle -import android.support.design.widget.BottomSheetDialogFragment +import com.google.android.material.bottomsheet.BottomSheetDialogFragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt b/src/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt index 498cb1f0e9..7229cb5df2 100644 --- a/src/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt +++ b/src/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.loki.dialogs import android.os.Bundle -import android.support.design.widget.BottomSheetDialogFragment +import com.google.android.material.bottomsheet.BottomSheetDialogFragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/DeviceEditingOptionsBottomSheet.kt b/src/org/thoughtcrime/securesms/loki/dialogs/DeviceEditingOptionsBottomSheet.kt index b452c1364d..527f88d1e5 100644 --- a/src/org/thoughtcrime/securesms/loki/dialogs/DeviceEditingOptionsBottomSheet.kt +++ b/src/org/thoughtcrime/securesms/loki/dialogs/DeviceEditingOptionsBottomSheet.kt @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.loki.dialogs import android.os.Bundle -import android.support.design.widget.BottomSheetDialogFragment +import com.google.android.material.bottomsheet.BottomSheetDialogFragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/EditDeviceNameDialog.kt b/src/org/thoughtcrime/securesms/loki/dialogs/EditDeviceNameDialog.kt index e66d3eb387..6ae8b2c4cb 100644 --- a/src/org/thoughtcrime/securesms/loki/dialogs/EditDeviceNameDialog.kt +++ b/src/org/thoughtcrime/securesms/loki/dialogs/EditDeviceNameDialog.kt @@ -4,8 +4,8 @@ import android.app.Dialog import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Bundle -import android.support.v4.app.DialogFragment -import android.support.v7.app.AlertDialog +import androidx.fragment.app.DialogFragment +import androidx.appcompat.app.AlertDialog import android.view.LayoutInflater import android.view.View import kotlinx.android.synthetic.main.dialog_edit_device_name.view.* diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/LinkDeviceMasterModeDialog.kt b/src/org/thoughtcrime/securesms/loki/dialogs/LinkDeviceMasterModeDialog.kt index 7dd30cf323..ed55eca238 100644 --- a/src/org/thoughtcrime/securesms/loki/dialogs/LinkDeviceMasterModeDialog.kt +++ b/src/org/thoughtcrime/securesms/loki/dialogs/LinkDeviceMasterModeDialog.kt @@ -4,8 +4,8 @@ import android.app.Dialog import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Bundle -import android.support.v4.app.DialogFragment -import android.support.v7.app.AlertDialog +import androidx.fragment.app.DialogFragment +import androidx.appcompat.app.AlertDialog import android.view.LayoutInflater import android.view.View import android.widget.LinearLayout diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/LinkDeviceSlaveModeDialog.kt b/src/org/thoughtcrime/securesms/loki/dialogs/LinkDeviceSlaveModeDialog.kt index b87530bfa0..d795e3148f 100644 --- a/src/org/thoughtcrime/securesms/loki/dialogs/LinkDeviceSlaveModeDialog.kt +++ b/src/org/thoughtcrime/securesms/loki/dialogs/LinkDeviceSlaveModeDialog.kt @@ -5,8 +5,8 @@ import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.os.Handler -import android.support.v4.app.DialogFragment -import android.support.v7.app.AlertDialog +import androidx.fragment.app.DialogFragment +import androidx.appcompat.app.AlertDialog import android.view.LayoutInflater import android.view.View import android.widget.LinearLayout diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/MultiDeviceRemovalBottomSheet.kt b/src/org/thoughtcrime/securesms/loki/dialogs/MultiDeviceRemovalBottomSheet.kt index e236751d98..70e33d8476 100644 --- a/src/org/thoughtcrime/securesms/loki/dialogs/MultiDeviceRemovalBottomSheet.kt +++ b/src/org/thoughtcrime/securesms/loki/dialogs/MultiDeviceRemovalBottomSheet.kt @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.loki.dialogs import android.graphics.Typeface import android.os.Bundle -import android.support.design.widget.BottomSheetDialogFragment +import com.google.android.material.bottomsheet.BottomSheetDialogFragment import android.text.Spannable import android.text.SpannableStringBuilder import android.text.method.LinkMovementMethod diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/OpenGroupSuggestionBottomSheet.kt b/src/org/thoughtcrime/securesms/loki/dialogs/OpenGroupSuggestionBottomSheet.kt index c87e4f4ef0..d8a84b13c7 100644 --- a/src/org/thoughtcrime/securesms/loki/dialogs/OpenGroupSuggestionBottomSheet.kt +++ b/src/org/thoughtcrime/securesms/loki/dialogs/OpenGroupSuggestionBottomSheet.kt @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.loki.dialogs import android.os.Bundle -import android.support.design.widget.BottomSheetDialogFragment +import com.google.android.material.bottomsheet.BottomSheetDialogFragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt b/src/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt index 3caf3d752b..59f96ae433 100644 --- a/src/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt +++ b/src/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt @@ -7,8 +7,8 @@ import android.content.Context import android.graphics.Color import android.graphics.drawable.ColorDrawable import android.os.Bundle -import android.support.v4.app.DialogFragment -import android.support.v7.app.AlertDialog +import androidx.fragment.app.DialogFragment +import androidx.appcompat.app.AlertDialog import android.view.LayoutInflater import android.widget.Toast import kotlinx.android.synthetic.main.dialog_seed.view.* @@ -44,7 +44,7 @@ class SeedDialog : DialogFragment() { private fun copySeed() { val clipboard = activity!!.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager val clip = ClipData.newPlainText("Seed", seed) - clipboard.primaryClip = clip + clipboard.setPrimaryClip(clip) Toast.makeText(context!!, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show() dismiss() } diff --git a/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt b/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt index 1180305d5d..d9cfa2f617 100644 --- a/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt +++ b/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.loki.fragments import android.content.Context -import android.support.v7.widget.RecyclerView +import androidx.recyclerview.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt b/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt index e91f0a3355..2bd6924783 100644 --- a/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt +++ b/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt @@ -1,11 +1,11 @@ package org.thoughtcrime.securesms.loki.fragments import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v4.app.LoaderManager -import android.support.v4.content.Loader -import android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener -import android.support.v7.widget.LinearLayoutManager +import androidx.fragment.app.Fragment +import androidx.loader.app.LoaderManager +import androidx.loader.content.Loader +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener +import androidx.recyclerview.widget.LinearLayoutManager import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/src/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeFragment.kt b/src/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeFragment.kt index 68b098c655..6f380edb0b 100644 --- a/src/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeFragment.kt +++ b/src/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeFragment.kt @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.loki.fragments import android.content.res.Configuration import android.os.Bundle -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/src/org/thoughtcrime/securesms/loki/fragments/ScanQRCodePlaceholderFragment.kt b/src/org/thoughtcrime/securesms/loki/fragments/ScanQRCodePlaceholderFragment.kt index 544023f2d4..13e46b6fe1 100644 --- a/src/org/thoughtcrime/securesms/loki/fragments/ScanQRCodePlaceholderFragment.kt +++ b/src/org/thoughtcrime/securesms/loki/fragments/ScanQRCodePlaceholderFragment.kt @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.loki.fragments import android.os.Bundle -import android.support.v4.app.Fragment +import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/src/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeWrapperFragment.kt b/src/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeWrapperFragment.kt index 7c8c416513..ac420ec241 100644 --- a/src/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeWrapperFragment.kt +++ b/src/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeWrapperFragment.kt @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.loki.fragments import android.Manifest import android.content.pm.PackageManager import android.os.Bundle -import android.support.v4.app.Fragment -import android.support.v4.content.ContextCompat +import androidx.fragment.app.Fragment +import androidx.core.content.ContextCompat import android.view.LayoutInflater import android.view.View import android.view.ViewGroup diff --git a/src/org/thoughtcrime/securesms/loki/todo/JazzIdenticonContactPhoto.kt b/src/org/thoughtcrime/securesms/loki/todo/JazzIdenticonContactPhoto.kt index 97b97502df..a26751ad48 100644 --- a/src/org/thoughtcrime/securesms/loki/todo/JazzIdenticonContactPhoto.kt +++ b/src/org/thoughtcrime/securesms/loki/todo/JazzIdenticonContactPhoto.kt @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.loki.todo import android.content.Context import android.graphics.drawable.Drawable -import android.support.v7.content.res.AppCompatResources +import androidx.appcompat.content.res.AppCompatResources import network.loki.messenger.R import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto diff --git a/src/org/thoughtcrime/securesms/loki/utilities/ActivityUtilities.kt b/src/org/thoughtcrime/securesms/loki/utilities/ActivityUtilities.kt index 3ab0ff813b..656de0436f 100644 --- a/src/org/thoughtcrime/securesms/loki/utilities/ActivityUtilities.kt +++ b/src/org/thoughtcrime/securesms/loki/utilities/ActivityUtilities.kt @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.loki.utilities import android.content.Intent -import android.support.v7.app.ActionBar -import android.support.v7.app.AppCompatActivity +import androidx.appcompat.app.ActionBar +import androidx.appcompat.app.AppCompatActivity import android.view.Gravity import android.widget.ImageView import android.widget.RelativeLayout diff --git a/src/org/thoughtcrime/securesms/loki/utilities/Broadcaster.kt b/src/org/thoughtcrime/securesms/loki/utilities/Broadcaster.kt index ebab9df16a..02cf41dd10 100644 --- a/src/org/thoughtcrime/securesms/loki/utilities/Broadcaster.kt +++ b/src/org/thoughtcrime/securesms/loki/utilities/Broadcaster.kt @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.loki.utilities import android.content.Context import android.content.Intent -import android.support.v4.content.LocalBroadcastManager +import androidx.localbroadcastmanager.content.LocalBroadcastManager class Broadcaster(private val context: Context) : org.whispersystems.signalservice.loki.utilities.Broadcaster { diff --git a/src/org/thoughtcrime/securesms/loki/utilities/GeneralUtilities.kt b/src/org/thoughtcrime/securesms/loki/utilities/GeneralUtilities.kt index e788255822..3ff3bd19a5 100644 --- a/src/org/thoughtcrime/securesms/loki/utilities/GeneralUtilities.kt +++ b/src/org/thoughtcrime/securesms/loki/utilities/GeneralUtilities.kt @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.loki.utilities import android.content.Context import android.content.res.Resources import android.os.Build -import android.support.annotation.ColorRes +import androidx.annotation.ColorRes import org.thoughtcrime.securesms.database.DatabaseFactory import kotlin.math.roundToInt diff --git a/src/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt b/src/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt index 35bffffae9..8cd1204167 100644 --- a/src/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt +++ b/src/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt @@ -4,7 +4,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.content.IntentFilter -import android.support.v4.content.LocalBroadcastManager +import androidx.localbroadcastmanager.content.LocalBroadcastManager import android.util.Log import com.opencsv.CSVReader import org.whispersystems.signalservice.loki.api.onionrequests.OnionRequestAPI diff --git a/src/org/thoughtcrime/securesms/loki/utilities/ViewUtilities.kt b/src/org/thoughtcrime/securesms/loki/utilities/ViewUtilities.kt index 3038c076ae..5c329762f4 100644 --- a/src/org/thoughtcrime/securesms/loki/utilities/ViewUtilities.kt +++ b/src/org/thoughtcrime/securesms/loki/utilities/ViewUtilities.kt @@ -6,7 +6,7 @@ import android.animation.FloatEvaluator import android.animation.ValueAnimator import android.graphics.PointF import android.graphics.Rect -import android.support.annotation.DimenRes +import androidx.annotation.DimenRes import android.view.View fun View.contains(point: PointF): Boolean { diff --git a/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt b/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt index 1b26e1d917..b81ea34291 100644 --- a/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt +++ b/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt @@ -13,8 +13,8 @@ import android.os.Build import android.os.VibrationEffect import android.os.VibrationEffect.DEFAULT_AMPLITUDE import android.os.Vibrator -import android.support.annotation.ColorRes -import android.support.annotation.DrawableRes +import androidx.annotation.ColorRes +import androidx.annotation.DrawableRes import android.util.AttributeSet import android.view.Gravity import android.view.MotionEvent diff --git a/src/org/thoughtcrime/securesms/loki/views/PathStatusView.kt b/src/org/thoughtcrime/securesms/loki/views/PathStatusView.kt index c56c0c51c6..3fd4158b89 100644 --- a/src/org/thoughtcrime/securesms/loki/views/PathStatusView.kt +++ b/src/org/thoughtcrime/securesms/loki/views/PathStatusView.kt @@ -4,7 +4,7 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent import android.content.IntentFilter -import android.support.v4.content.LocalBroadcastManager +import androidx.localbroadcastmanager.content.LocalBroadcastManager import android.util.AttributeSet import android.view.View import network.loki.messenger.R diff --git a/src/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt b/src/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt index 1250be7514..717baa3270 100644 --- a/src/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt +++ b/src/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.loki.views import android.content.Context -import android.support.annotation.DimenRes +import androidx.annotation.DimenRes import android.util.AttributeSet import android.view.LayoutInflater import android.view.View diff --git a/src/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java b/src/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java index 63da62079a..c245136bba 100644 --- a/src/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java +++ b/src/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java @@ -1,13 +1,13 @@ package org.thoughtcrime.securesms.longmessage; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.content.Context; import android.content.Intent; import android.graphics.PorterDuff; import android.graphics.drawable.ColorDrawable; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.SpannableString; import android.text.method.LinkMovementMethod; import android.text.style.URLSpan; diff --git a/src/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java b/src/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java index 2b296eca14..5b31a0ba8c 100644 --- a/src/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java +++ b/src/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.longmessage; import android.content.Context; import android.database.Cursor; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.WorkerThread; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MmsDatabase; diff --git a/src/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java b/src/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java index fc5f6c247f..393bd97ccd 100644 --- a/src/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java +++ b/src/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java @@ -1,15 +1,15 @@ package org.thoughtcrime.securesms.longmessage; import android.app.Application; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.MutableLiveData; -import android.arch.lifecycle.ViewModel; -import android.arch.lifecycle.ViewModelProvider; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; +import androidx.lifecycle.ViewModelProvider; import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.database.DatabaseContentProviders; import org.whispersystems.libsignal.util.guava.Optional; diff --git a/src/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java b/src/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java index 987d3cab22..b5d4682e3a 100644 --- a/src/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java +++ b/src/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java @@ -1,13 +1,13 @@ package org.thoughtcrime.securesms.mediapreview; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.MutableLiveData; -import android.arch.lifecycle.ViewModel; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; import android.content.Context; import android.database.Cursor; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.database.MediaDatabase.MediaRecord; import org.thoughtcrime.securesms.mediasend.Media; diff --git a/src/org/thoughtcrime/securesms/mediapreview/MediaRailAdapter.java b/src/org/thoughtcrime/securesms/mediapreview/MediaRailAdapter.java index 770d7910aa..605676dcd0 100644 --- a/src/org/thoughtcrime/securesms/mediapreview/MediaRailAdapter.java +++ b/src/org/thoughtcrime/securesms/mediapreview/MediaRailAdapter.java @@ -1,15 +1,14 @@ package org.thoughtcrime.securesms.mediapreview; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import network.loki.messenger.R; import org.thoughtcrime.securesms.components.ThumbnailView; -import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mediasend.Media; import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.util.StableIdGenerator; diff --git a/src/org/thoughtcrime/securesms/mediasend/Camera1Controller.java b/src/org/thoughtcrime/securesms/mediasend/Camera1Controller.java index 1bc0da102e..69d7b0e0ab 100644 --- a/src/org/thoughtcrime/securesms/mediasend/Camera1Controller.java +++ b/src/org/thoughtcrime/securesms/mediasend/Camera1Controller.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.mediasend; import android.graphics.SurfaceTexture; import android.hardware.Camera; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.Surface; import org.thoughtcrime.securesms.logging.Log; diff --git a/src/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java b/src/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java index 45c7eb6430..df51dba9f4 100644 --- a/src/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java +++ b/src/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.mediasend; import android.annotation.SuppressLint; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.content.res.Configuration; import android.graphics.Bitmap; import android.graphics.Matrix; @@ -9,11 +9,10 @@ import android.graphics.Point; import android.graphics.PointF; import android.graphics.SurfaceTexture; import android.graphics.drawable.Drawable; -import android.hardware.Camera; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.view.Display; import android.view.GestureDetector; import android.view.LayoutInflater; @@ -22,7 +21,6 @@ import android.view.TextureView; import android.view.View; import android.view.ViewGroup; import android.view.WindowManager; -import android.view.animation.AccelerateDecelerateInterpolator; import android.view.animation.Animation; import android.view.animation.AnimationUtils; import android.view.animation.DecelerateInterpolator; diff --git a/src/org/thoughtcrime/securesms/mediasend/FlipTransformation.java b/src/org/thoughtcrime/securesms/mediasend/FlipTransformation.java index d443dfefc6..0c4749b338 100644 --- a/src/org/thoughtcrime/securesms/mediasend/FlipTransformation.java +++ b/src/org/thoughtcrime/securesms/mediasend/FlipTransformation.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.mediasend; import android.graphics.Bitmap; import android.graphics.Canvas; import android.graphics.Matrix; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; import com.bumptech.glide.load.resource.bitmap.BitmapTransformation; diff --git a/src/org/thoughtcrime/securesms/mediasend/Media.java b/src/org/thoughtcrime/securesms/mediasend/Media.java index 3563d5ffb1..842d8371a3 100644 --- a/src/org/thoughtcrime/securesms/mediasend/Media.java +++ b/src/org/thoughtcrime/securesms/mediasend/Media.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.mediasend; import android.net.Uri; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.whispersystems.libsignal.util.guava.Optional; diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaFolder.java b/src/org/thoughtcrime/securesms/mediasend/MediaFolder.java index a6e3dd7e92..ab53c1204a 100644 --- a/src/org/thoughtcrime/securesms/mediasend/MediaFolder.java +++ b/src/org/thoughtcrime/securesms/mediasend/MediaFolder.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.mediasend; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; /** * Represents a folder that's shown in {@link MediaPickerFolderFragment}. diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderAdapter.java b/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderAdapter.java index 15189f3070..de7bb04607 100644 --- a/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderAdapter.java +++ b/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderAdapter.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.mediasend; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java index 4ba7db24ba..d492a113d1 100644 --- a/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java +++ b/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java @@ -1,17 +1,17 @@ package org.thoughtcrime.securesms.mediasend; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.content.Context; import android.content.res.Configuration; import android.graphics.Point; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java b/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java index 6d56932487..07d92fae0b 100644 --- a/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java +++ b/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.mediasend; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -18,11 +18,8 @@ import org.thoughtcrime.securesms.util.StableIdGenerator; import java.util.ArrayList; import java.util.Collection; -import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; -import java.util.Set; -import java.util.TreeSet; public class MediaPickerItemAdapter extends RecyclerView.Adapter { diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java index a6d4ac6660..25dec732d6 100644 --- a/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java +++ b/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java @@ -1,17 +1,17 @@ package org.thoughtcrime.securesms.mediasend; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.content.Context; import android.content.res.Configuration; import android.graphics.Point; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaRepository.java b/src/org/thoughtcrime/securesms/mediasend/MediaRepository.java index cf8834176f..d63bfbdb38 100644 --- a/src/org/thoughtcrime/securesms/mediasend/MediaRepository.java +++ b/src/org/thoughtcrime/securesms/mediasend/MediaRepository.java @@ -5,14 +5,13 @@ import android.content.Context; import android.database.Cursor; import android.net.Uri; import android.os.AsyncTask; -import android.os.Build; import android.os.Environment; import android.provider.MediaStore.Images; import android.provider.MediaStore.Video; import android.provider.OpenableColumns; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import android.util.Pair; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java index 0bf78be56a..a2e0e4190d 100644 --- a/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java +++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java @@ -1,14 +1,14 @@ package org.thoughtcrime.securesms.mediasend; import android.Manifest; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; import android.view.View; import android.view.animation.AccelerateDecelerateInterpolator; import android.view.animation.AccelerateInterpolator; diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java index 818b93d6c8..c9b4020322 100644 --- a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java +++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.mediasend; import android.annotation.SuppressLint; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.content.Context; import android.graphics.Bitmap; import android.graphics.PorterDuff; @@ -9,14 +9,14 @@ import android.graphics.Rect; import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AlertDialog; -import android.support.v7.view.ContextThemeWrapper; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.view.ContextThemeWrapper; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.Editable; import android.text.TextWatcher; import android.view.KeyEvent; diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragmentPagerAdapter.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendFragmentPagerAdapter.java index 31e718d121..4d6107044f 100644 --- a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragmentPagerAdapter.java +++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendFragmentPagerAdapter.java @@ -1,11 +1,11 @@ package org.thoughtcrime.securesms.mediasend; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendGifFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendGifFragment.java index 30f4ad3503..fec59e0705 100644 --- a/src/org/thoughtcrime/securesms/mediasend/MediaSendGifFragment.java +++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendGifFragment.java @@ -2,9 +2,9 @@ package org.thoughtcrime.securesms.mediasend; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendPageFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendPageFragment.java index aab97cd043..6de248489f 100644 --- a/src/org/thoughtcrime/securesms/mediasend/MediaSendPageFragment.java +++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendPageFragment.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.mediasend; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; /** diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java index 2db8c8468c..6f98363c57 100644 --- a/src/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java +++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java @@ -2,9 +2,9 @@ package org.thoughtcrime.securesms.mediasend; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java index 6dac4c66df..ac045b2cee 100644 --- a/src/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java +++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java @@ -1,13 +1,13 @@ package org.thoughtcrime.securesms.mediasend; import android.app.Application; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.MutableLiveData; -import android.arch.lifecycle.ViewModel; -import android.arch.lifecycle.ViewModelProvider; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; +import androidx.lifecycle.ViewModelProvider; import android.content.Context; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/mediasend/OrderEnforcer.java b/src/org/thoughtcrime/securesms/mediasend/OrderEnforcer.java index 6851dd97a4..65974ac0c1 100644 --- a/src/org/thoughtcrime/securesms/mediasend/OrderEnforcer.java +++ b/src/org/thoughtcrime/securesms/mediasend/OrderEnforcer.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.mediasend; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java index 9ce2e90786..5f13c13e6c 100644 --- a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java +++ b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java @@ -30,8 +30,8 @@ import android.os.AsyncTask; import android.provider.ContactsContract; import android.provider.MediaStore; import android.provider.OpenableColumns; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Pair; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java b/src/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java index b033f70a47..e94e763fa7 100644 --- a/src/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java +++ b/src/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.mms; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.bumptech.glide.Priority; import com.bumptech.glide.load.DataSource; diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java b/src/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java index d98c68c006..4dc3b3243e 100644 --- a/src/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java +++ b/src/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.mms; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bumptech.glide.load.Key; import com.bumptech.glide.load.Options; diff --git a/src/org/thoughtcrime/securesms/mms/AudioSlide.java b/src/org/thoughtcrime/securesms/mms/AudioSlide.java index fb6e9a1eaa..546d3cae0b 100644 --- a/src/org/thoughtcrime/securesms/mms/AudioSlide.java +++ b/src/org/thoughtcrime/securesms/mms/AudioSlide.java @@ -19,9 +19,9 @@ package org.thoughtcrime.securesms.mms; import android.content.Context; import android.content.res.Resources.Theme; import android.net.Uri; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import network.loki.messenger.R; import org.thoughtcrime.securesms.attachments.Attachment; diff --git a/src/org/thoughtcrime/securesms/mms/CompatMmsConnection.java b/src/org/thoughtcrime/securesms/mms/CompatMmsConnection.java index 9f648e80df..8302cae814 100644 --- a/src/org/thoughtcrime/securesms/mms/CompatMmsConnection.java +++ b/src/org/thoughtcrime/securesms/mms/CompatMmsConnection.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.mms; import android.content.Context; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.logging.Log; import com.google.android.mms.pdu_alt.PduHeaders; diff --git a/src/org/thoughtcrime/securesms/mms/DecryptableStreamUriLoader.java b/src/org/thoughtcrime/securesms/mms/DecryptableStreamUriLoader.java index 37883c9f50..054de985db 100644 --- a/src/org/thoughtcrime/securesms/mms/DecryptableStreamUriLoader.java +++ b/src/org/thoughtcrime/securesms/mms/DecryptableStreamUriLoader.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.mms; import android.content.Context; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bumptech.glide.load.Key; import com.bumptech.glide.load.Options; diff --git a/src/org/thoughtcrime/securesms/mms/DocumentSlide.java b/src/org/thoughtcrime/securesms/mms/DocumentSlide.java index 33e6e6fb4d..24d6ceb133 100644 --- a/src/org/thoughtcrime/securesms/mms/DocumentSlide.java +++ b/src/org/thoughtcrime/securesms/mms/DocumentSlide.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.mms; import android.content.Context; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.util.StorageUtil; diff --git a/src/org/thoughtcrime/securesms/mms/GifSlide.java b/src/org/thoughtcrime/securesms/mms/GifSlide.java index 7253e28bcd..a0f1caaaee 100644 --- a/src/org/thoughtcrime/securesms/mms/GifSlide.java +++ b/src/org/thoughtcrime/securesms/mms/GifSlide.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.mms; import android.content.Context; import android.net.Uri; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.util.MediaUtil; diff --git a/src/org/thoughtcrime/securesms/mms/ImageSlide.java b/src/org/thoughtcrime/securesms/mms/ImageSlide.java index 412ef1d64b..0502171c21 100644 --- a/src/org/thoughtcrime/securesms/mms/ImageSlide.java +++ b/src/org/thoughtcrime/securesms/mms/ImageSlide.java @@ -19,9 +19,9 @@ package org.thoughtcrime.securesms.mms; import android.content.Context; import android.content.res.Resources.Theme; import android.net.Uri; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import network.loki.messenger.R; import org.thoughtcrime.securesms.attachments.Attachment; diff --git a/src/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java b/src/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java index 3ba8f3b369..89e91902c9 100644 --- a/src/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java +++ b/src/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java @@ -18,8 +18,8 @@ package org.thoughtcrime.securesms.mms; import android.content.Context; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.logging.Log; import com.google.android.mms.InvalidHeaderValueException; diff --git a/src/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java b/src/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java index f86b52e897..a3c58e5513 100644 --- a/src/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java +++ b/src/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java @@ -21,8 +21,8 @@ import android.content.Context; import android.content.Intent; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.telephony.SmsManager; import org.thoughtcrime.securesms.logging.Log; diff --git a/src/org/thoughtcrime/securesms/mms/IncomingMmsConnection.java b/src/org/thoughtcrime/securesms/mms/IncomingMmsConnection.java index 96527e5162..44827068fd 100644 --- a/src/org/thoughtcrime/securesms/mms/IncomingMmsConnection.java +++ b/src/org/thoughtcrime/securesms/mms/IncomingMmsConnection.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.mms; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.android.mms.pdu_alt.RetrieveConf; diff --git a/src/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java b/src/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java index 3acf87d316..2b8fb34268 100644 --- a/src/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java +++ b/src/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java @@ -21,8 +21,8 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.pm.PackageManager; import android.net.ConnectivityManager; -import android.support.annotation.NonNull; -import android.support.v4.app.ActivityCompat; +import androidx.annotation.NonNull; +import androidx.core.app.ActivityCompat; import android.telephony.TelephonyManager; import android.text.TextUtils; diff --git a/src/org/thoughtcrime/securesms/mms/LocationSlide.java b/src/org/thoughtcrime/securesms/mms/LocationSlide.java index e5f613d2f9..2c89e0ec95 100644 --- a/src/org/thoughtcrime/securesms/mms/LocationSlide.java +++ b/src/org/thoughtcrime/securesms/mms/LocationSlide.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.mms; import android.content.Context; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.components.location.SignalPlace; import org.whispersystems.libsignal.util.guava.Optional; diff --git a/src/org/thoughtcrime/securesms/mms/MediaConstraints.java b/src/org/thoughtcrime/securesms/mms/MediaConstraints.java index edf0cb01ca..37ffb87e83 100644 --- a/src/org/thoughtcrime/securesms/mms/MediaConstraints.java +++ b/src/org/thoughtcrime/securesms/mms/MediaConstraints.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.mms; import android.content.Context; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.logging.Log; import android.util.Pair; diff --git a/src/org/thoughtcrime/securesms/mms/MmsConfigManager.java b/src/org/thoughtcrime/securesms/mms/MmsConfigManager.java index c0af332512..d356bf8f92 100644 --- a/src/org/thoughtcrime/securesms/mms/MmsConfigManager.java +++ b/src/org/thoughtcrime/securesms/mms/MmsConfigManager.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.mms; import android.content.Context; import android.content.res.Configuration; -import android.support.annotation.NonNull; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.WorkerThread; import com.android.mms.service_alt.MmsConfig; diff --git a/src/org/thoughtcrime/securesms/mms/MmsSlide.java b/src/org/thoughtcrime/securesms/mms/MmsSlide.java index bed6a6741d..08593a206f 100644 --- a/src/org/thoughtcrime/securesms/mms/MmsSlide.java +++ b/src/org/thoughtcrime/securesms/mms/MmsSlide.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.mms; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.attachments.Attachment; diff --git a/src/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java b/src/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java index 3391316904..27ad272116 100644 --- a/src/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java +++ b/src/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.mms; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.contactshare.Contact; diff --git a/src/org/thoughtcrime/securesms/mms/OutgoingLegacyMmsConnection.java b/src/org/thoughtcrime/securesms/mms/OutgoingLegacyMmsConnection.java index 1412daeddf..705616243c 100644 --- a/src/org/thoughtcrime/securesms/mms/OutgoingLegacyMmsConnection.java +++ b/src/org/thoughtcrime/securesms/mms/OutgoingLegacyMmsConnection.java @@ -20,8 +20,8 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.logging.Log; import com.google.android.mms.pdu_alt.PduParser; diff --git a/src/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java b/src/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java index 89a2f51fd6..64a9ecf1a4 100644 --- a/src/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java +++ b/src/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java @@ -22,8 +22,8 @@ import android.content.Intent; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.telephony.SmsManager; import org.thoughtcrime.securesms.logging.Log; diff --git a/src/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java b/src/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java index 091c2e81fc..6a73726448 100644 --- a/src/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java +++ b/src/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.mms; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import org.thoughtcrime.securesms.attachments.Attachment; diff --git a/src/org/thoughtcrime/securesms/mms/OutgoingMmsConnection.java b/src/org/thoughtcrime/securesms/mms/OutgoingMmsConnection.java index 4e1fce4aca..6f4b0cea89 100644 --- a/src/org/thoughtcrime/securesms/mms/OutgoingMmsConnection.java +++ b/src/org/thoughtcrime/securesms/mms/OutgoingMmsConnection.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.mms; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.android.mms.pdu_alt.SendConf; diff --git a/src/org/thoughtcrime/securesms/mms/OutgoingSecureMediaMessage.java b/src/org/thoughtcrime/securesms/mms/OutgoingSecureMediaMessage.java index 434fa92171..8332c06575 100644 --- a/src/org/thoughtcrime/securesms/mms/OutgoingSecureMediaMessage.java +++ b/src/org/thoughtcrime/securesms/mms/OutgoingSecureMediaMessage.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.mms; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.contactshare.Contact; diff --git a/src/org/thoughtcrime/securesms/mms/PartAuthority.java b/src/org/thoughtcrime/securesms/mms/PartAuthority.java index f6a0b71a9b..c16bb44d94 100644 --- a/src/org/thoughtcrime/securesms/mms/PartAuthority.java +++ b/src/org/thoughtcrime/securesms/mms/PartAuthority.java @@ -4,8 +4,8 @@ import android.content.ContentUris; import android.content.Context; import android.content.UriMatcher; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.attachments.AttachmentId; diff --git a/src/org/thoughtcrime/securesms/mms/QuoteId.java b/src/org/thoughtcrime/securesms/mms/QuoteId.java index b5158e172d..929c527600 100644 --- a/src/org/thoughtcrime/securesms/mms/QuoteId.java +++ b/src/org/thoughtcrime/securesms/mms/QuoteId.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.mms; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.json.JSONException; import org.json.JSONObject; diff --git a/src/org/thoughtcrime/securesms/mms/QuoteModel.java b/src/org/thoughtcrime/securesms/mms/QuoteModel.java index 43eba6f39a..953f0a5c0c 100644 --- a/src/org/thoughtcrime/securesms/mms/QuoteModel.java +++ b/src/org/thoughtcrime/securesms/mms/QuoteModel.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.mms; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.database.Address; diff --git a/src/org/thoughtcrime/securesms/mms/SignalGlideModule.java b/src/org/thoughtcrime/securesms/mms/SignalGlideModule.java index 808b54c93e..11379f54c3 100644 --- a/src/org/thoughtcrime/securesms/mms/SignalGlideModule.java +++ b/src/org/thoughtcrime/securesms/mms/SignalGlideModule.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.mms; import android.content.Context; import android.graphics.Bitmap; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import com.bumptech.glide.Glide; diff --git a/src/org/thoughtcrime/securesms/mms/Slide.java b/src/org/thoughtcrime/securesms/mms/Slide.java index 58b6934618..2c5dc1cb16 100644 --- a/src/org/thoughtcrime/securesms/mms/Slide.java +++ b/src/org/thoughtcrime/securesms/mms/Slide.java @@ -19,9 +19,9 @@ package org.thoughtcrime.securesms.mms; import android.content.Context; import android.content.res.Resources.Theme; import android.net.Uri; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.attachments.UriAttachment; diff --git a/src/org/thoughtcrime/securesms/mms/SlideDeck.java b/src/org/thoughtcrime/securesms/mms/SlideDeck.java index d39c4ec913..8d654df472 100644 --- a/src/org/thoughtcrime/securesms/mms/SlideDeck.java +++ b/src/org/thoughtcrime/securesms/mms/SlideDeck.java @@ -17,8 +17,8 @@ package org.thoughtcrime.securesms.mms; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/mms/StickerSlide.java b/src/org/thoughtcrime/securesms/mms/StickerSlide.java index ed49c79f0a..75baee0f35 100644 --- a/src/org/thoughtcrime/securesms/mms/StickerSlide.java +++ b/src/org/thoughtcrime/securesms/mms/StickerSlide.java @@ -3,9 +3,9 @@ package org.thoughtcrime.securesms.mms; import android.content.Context; import android.content.res.Resources.Theme; import android.net.Uri; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.stickers.StickerLocator; diff --git a/src/org/thoughtcrime/securesms/mms/TextSlide.java b/src/org/thoughtcrime/securesms/mms/TextSlide.java index d0b75ea0e5..d3612143e9 100644 --- a/src/org/thoughtcrime/securesms/mms/TextSlide.java +++ b/src/org/thoughtcrime/securesms/mms/TextSlide.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.mms; import android.content.Context; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.util.MediaUtil; diff --git a/src/org/thoughtcrime/securesms/mms/VideoSlide.java b/src/org/thoughtcrime/securesms/mms/VideoSlide.java index f290f2bd71..3ab2375f7c 100644 --- a/src/org/thoughtcrime/securesms/mms/VideoSlide.java +++ b/src/org/thoughtcrime/securesms/mms/VideoSlide.java @@ -19,9 +19,9 @@ package org.thoughtcrime.securesms.mms; import android.content.Context; import android.content.res.Resources.Theme; import android.net.Uri; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import network.loki.messenger.R; import org.thoughtcrime.securesms.attachments.Attachment; diff --git a/src/org/thoughtcrime/securesms/net/CallRequestController.java b/src/org/thoughtcrime/securesms/net/CallRequestController.java index e3a3e1c665..034fc3189c 100644 --- a/src/org/thoughtcrime/securesms/net/CallRequestController.java +++ b/src/org/thoughtcrime/securesms/net/CallRequestController.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.net; import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.WorkerThread; import org.thoughtcrime.securesms.util.Util; import org.whispersystems.libsignal.util.guava.Optional; diff --git a/src/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java b/src/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java index bf7946f908..acffd4156e 100644 --- a/src/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java +++ b/src/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.net; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/net/CompositeRequestController.java b/src/org/thoughtcrime/securesms/net/CompositeRequestController.java index b6aec71a0d..4c2e2fc49b 100644 --- a/src/org/thoughtcrime/securesms/net/CompositeRequestController.java +++ b/src/org/thoughtcrime/securesms/net/CompositeRequestController.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.net; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/net/ContentProxySafetyInterceptor.java b/src/org/thoughtcrime/securesms/net/ContentProxySafetyInterceptor.java index 51d32ba2ae..992500b8c1 100644 --- a/src/org/thoughtcrime/securesms/net/ContentProxySafetyInterceptor.java +++ b/src/org/thoughtcrime/securesms/net/ContentProxySafetyInterceptor.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.net; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil; import org.thoughtcrime.securesms.logging.Log; diff --git a/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java b/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java index a1670a7827..32a14ccc7a 100644 --- a/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java +++ b/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java @@ -4,9 +4,9 @@ import android.app.Notification; import android.content.Context; import android.graphics.Color; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.NotificationCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; import android.text.SpannableStringBuilder; import android.text.TextUtils; diff --git a/src/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java b/src/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java index c77e2753b7..18383ebf9c 100644 --- a/src/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java +++ b/src/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java @@ -22,7 +22,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.os.AsyncTask; -import android.support.v4.app.NotificationManagerCompat; +import androidx.core.app.NotificationManagerCompat; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/src/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java b/src/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java index d55df50a33..b7af08227f 100644 --- a/src/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java +++ b/src/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java @@ -23,7 +23,7 @@ import android.content.Context; import android.content.Intent; import android.os.AsyncTask; import android.os.Bundle; -import android.support.v4.app.RemoteInput; +import androidx.core.app.RemoteInput; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.database.Address; diff --git a/src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java index 450607e14a..6945c05027 100644 --- a/src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java +++ b/src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java @@ -33,9 +33,9 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Build; import android.service.notification.StatusBarNotification; -import android.support.annotation.NonNull; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.NotificationManagerCompat; +import androidx.annotation.NonNull; +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationManagerCompat; import android.text.TextUtils; import org.thoughtcrime.securesms.ApplicationContext; @@ -61,7 +61,6 @@ import org.thoughtcrime.securesms.util.SpanUtil; import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.webrtc.CallNotificationBuilder; import org.whispersystems.signalservice.internal.util.Util; -import org.whispersystems.signalservice.loki.protocol.mentions.Mention; import java.util.HashSet; import java.util.List; diff --git a/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java b/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java index 8f556026e1..141a8b8195 100644 --- a/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java +++ b/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java @@ -5,8 +5,8 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.v4.app.NotificationManagerCompat; +import androidx.annotation.NonNull; +import androidx.core.app.NotificationManagerCompat; import com.annimon.stream.Collectors; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java index 16f4343bea..7de28dfdef 100644 --- a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java +++ b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java @@ -14,6 +14,6 @@ public interface MessageNotifier { void updateNotification(@NonNull Context context); void updateNotification(@NonNull Context context, long threadId); void updateNotification(@NonNull Context context, long threadId, boolean signal); - void updateNotification(@android.support.annotation.NonNull Context context, boolean signal, int reminderCount); + void updateNotification(@androidx.annotation.NonNull Context context, boolean signal, int reminderCount); void clearReminder(@NonNull Context context); } diff --git a/src/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java b/src/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java index be91fe34b5..11e57af368 100644 --- a/src/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java +++ b/src/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java @@ -4,9 +4,9 @@ import android.app.Notification; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.NotificationCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; import android.text.SpannableStringBuilder; import org.thoughtcrime.securesms.loki.activities.HomeActivity; diff --git a/src/org/thoughtcrime/securesms/notifications/NotificationChannels.java b/src/org/thoughtcrime/securesms/notifications/NotificationChannels.java index 7343e70ac8..748395b151 100644 --- a/src/org/thoughtcrime/securesms/notifications/NotificationChannels.java +++ b/src/org/thoughtcrime/securesms/notifications/NotificationChannels.java @@ -12,9 +12,9 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Build; import android.provider.Settings; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import android.text.TextUtils; import com.annimon.stream.Collectors; diff --git a/src/org/thoughtcrime/securesms/notifications/NotificationItem.java b/src/org/thoughtcrime/securesms/notifications/NotificationItem.java index 3423b33266..7ffa4d1852 100644 --- a/src/org/thoughtcrime/securesms/notifications/NotificationItem.java +++ b/src/org/thoughtcrime/securesms/notifications/NotificationItem.java @@ -4,9 +4,9 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.TaskStackBuilder; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.TaskStackBuilder; import org.thoughtcrime.securesms.conversation.ConversationActivity; import org.thoughtcrime.securesms.mms.SlideDeck; diff --git a/src/org/thoughtcrime/securesms/notifications/NotificationState.java b/src/org/thoughtcrime/securesms/notifications/NotificationState.java index 32b5489e35..6200ff0382 100644 --- a/src/org/thoughtcrime/securesms/notifications/NotificationState.java +++ b/src/org/thoughtcrime/securesms/notifications/NotificationState.java @@ -4,8 +4,8 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.conversation.ConversationActivity; import org.thoughtcrime.securesms.conversation.ConversationPopupActivity; diff --git a/src/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java b/src/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java index ee2601e3ff..1050b3a2f8 100644 --- a/src/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java +++ b/src/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java @@ -99,7 +99,7 @@ public class OptimizedMessageNotifier implements MessageNotifier { } @Override - public void updateNotification(@android.support.annotation.NonNull Context context, boolean signal, int reminderCount) { + public void updateNotification(@androidx.annotation.NonNull Context context, boolean signal, int reminderCount) { Poller lokiPoller = ApplicationContext.getInstance(context).poller; PublicChatManager publicChatManager = ApplicationContext.getInstance(context).publicChatManager; boolean isCaughtUp = true; diff --git a/src/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java b/src/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java index 50bf8a3c20..e4605df2a4 100644 --- a/src/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java +++ b/src/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java @@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.notifications; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; -import android.support.v4.app.NotificationCompat; +import androidx.core.app.NotificationCompat; import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.loki.activities.HomeActivity; diff --git a/src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java b/src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java index 84ff4c1664..ca92ecc06b 100644 --- a/src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java +++ b/src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java @@ -23,7 +23,7 @@ import android.content.Context; import android.content.Intent; import android.os.AsyncTask; import android.os.Bundle; -import android.support.v4.app.RemoteInput; +import androidx.core.app.RemoteInput; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.database.Address; @@ -33,7 +33,6 @@ import org.thoughtcrime.securesms.mms.OutgoingMediaMessage; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.sms.MessageSender; import org.thoughtcrime.securesms.sms.OutgoingEncryptedMessage; -import org.thoughtcrime.securesms.sms.OutgoingTextMessage; import java.util.Collections; import java.util.LinkedList; diff --git a/src/org/thoughtcrime/securesms/notifications/ReplyMethod.java b/src/org/thoughtcrime/securesms/notifications/ReplyMethod.java index e744b5f58b..f9e80a34bd 100644 --- a/src/org/thoughtcrime/securesms/notifications/ReplyMethod.java +++ b/src/org/thoughtcrime/securesms/notifications/ReplyMethod.java @@ -1,11 +1,9 @@ package org.thoughtcrime.securesms.notifications; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; -import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.recipients.Recipient; -import org.thoughtcrime.securesms.util.TextSecurePreferences; public enum ReplyMethod { diff --git a/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java b/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java index 0476cdff2f..bc5f695a35 100644 --- a/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java +++ b/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java @@ -14,12 +14,12 @@ import android.graphics.RectF; import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.NotificationCompat.Action; -import android.support.v4.app.RemoteInput; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationCompat.Action; +import androidx.core.app.RemoteInput; import android.text.SpannableStringBuilder; import com.bumptech.glide.load.engine.DiskCacheStrategy; diff --git a/src/org/thoughtcrime/securesms/permissions/Permissions.java b/src/org/thoughtcrime/securesms/permissions/Permissions.java index 96e479cd45..70e2da80fb 100644 --- a/src/org/thoughtcrime/securesms/permissions/Permissions.java +++ b/src/org/thoughtcrime/securesms/permissions/Permissions.java @@ -9,11 +9,11 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.os.Build; import android.provider.Settings; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.Fragment; -import android.support.v4.content.ContextCompat; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.core.app.ActivityCompat; +import androidx.fragment.app.Fragment; +import androidx.core.content.ContextCompat; import android.util.DisplayMetrics; import android.view.Display; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/permissions/PermissionsRequest.java b/src/org/thoughtcrime/securesms/permissions/PermissionsRequest.java index 4837911005..03942adfa5 100644 --- a/src/org/thoughtcrime/securesms/permissions/PermissionsRequest.java +++ b/src/org/thoughtcrime/securesms/permissions/PermissionsRequest.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.permissions; import android.content.pm.PackageManager; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.annimon.stream.function.Consumer; diff --git a/src/org/thoughtcrime/securesms/permissions/RationaleDialog.java b/src/org/thoughtcrime/securesms/permissions/RationaleDialog.java index 730577e639..ccacd0873f 100644 --- a/src/org/thoughtcrime/securesms/permissions/RationaleDialog.java +++ b/src/org/thoughtcrime/securesms/permissions/RationaleDialog.java @@ -4,8 +4,8 @@ package org.thoughtcrime.securesms.permissions; import android.app.AlertDialog; import android.content.Context; import android.graphics.Color; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java index 094f1fa12e..f50efdff58 100644 --- a/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java @@ -9,11 +9,11 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; import android.provider.ContactsContract; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.AlertDialog; -import android.support.v7.preference.CheckBoxPreference; -import android.support.v7.preference.Preference; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.CheckBoxPreference; +import androidx.preference.Preference; import android.widget.Toast; import org.thoughtcrime.securesms.ApplicationPreferencesActivity; diff --git a/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java index 5f24d30be8..6bbcd78577 100644 --- a/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java @@ -5,10 +5,10 @@ import android.app.KeyguardManager; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AlertDialog; -import android.support.v7.preference.CheckBoxPreference; -import android.support.v7.preference.Preference; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.CheckBoxPreference; +import androidx.preference.Preference; import android.widget.Toast; import org.thoughtcrime.securesms.ApplicationContext; diff --git a/src/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java index 44ccb61111..8266b86abc 100644 --- a/src/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.preferences; import android.content.Context; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.preference.ListPreference; +import androidx.annotation.Nullable; +import androidx.preference.ListPreference; import org.thoughtcrime.securesms.ApplicationPreferencesActivity; import network.loki.messenger.R; diff --git a/src/org/thoughtcrime/securesms/preferences/BlockedContactListItem.java b/src/org/thoughtcrime/securesms/preferences/BlockedContactListItem.java index b63cd0d6e5..6ae0518b9b 100644 --- a/src/org/thoughtcrime/securesms/preferences/BlockedContactListItem.java +++ b/src/org/thoughtcrime/securesms/preferences/BlockedContactListItem.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.preferences; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.AttributeSet; import android.widget.RelativeLayout; import android.widget.TextView; diff --git a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java index 3b6ea99151..877da0506d 100644 --- a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java @@ -5,11 +5,11 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.AlertDialog; -import android.support.v7.preference.EditTextPreference; -import android.support.v7.preference.Preference; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.EditTextPreference; +import androidx.preference.Preference; import android.text.TextUtils; import org.greenrobot.eventbus.EventBus; diff --git a/src/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java index 7b17a4cf20..6b097a0d56 100644 --- a/src/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java @@ -3,15 +3,15 @@ package org.thoughtcrime.securesms.preferences; import android.annotation.SuppressLint; import android.os.Bundle; -import android.support.v4.app.DialogFragment; -import android.support.v4.view.ViewCompat; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceCategory; -import android.support.v7.preference.PreferenceFragmentCompat; -import android.support.v7.preference.PreferenceGroupAdapter; -import android.support.v7.preference.PreferenceScreen; -import android.support.v7.preference.PreferenceViewHolder; -import android.support.v7.widget.RecyclerView; +import androidx.fragment.app.DialogFragment; +import androidx.core.view.ViewCompat; +import androidx.preference.Preference; +import androidx.preference.PreferenceCategory; +import androidx.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceGroupAdapter; +import androidx.preference.PreferenceScreen; +import androidx.preference.PreferenceViewHolder; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java index 2d155dd32e..4b330459e6 100644 --- a/src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.preferences; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.Preference; +import androidx.preference.ListPreference; +import androidx.preference.Preference; import network.loki.messenger.R; diff --git a/src/org/thoughtcrime/securesms/preferences/MmsPreferencesActivity.java b/src/org/thoughtcrime/securesms/preferences/MmsPreferencesActivity.java index 469f29e2a7..d0e4d944e4 100644 --- a/src/org/thoughtcrime/securesms/preferences/MmsPreferencesActivity.java +++ b/src/org/thoughtcrime/securesms/preferences/MmsPreferencesActivity.java @@ -17,9 +17,9 @@ package org.thoughtcrime.securesms.preferences; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; import android.view.MenuItem; import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity; diff --git a/src/org/thoughtcrime/securesms/preferences/MmsPreferencesFragment.java b/src/org/thoughtcrime/securesms/preferences/MmsPreferencesFragment.java index 25e76dc8a5..70a2c5b3ac 100644 --- a/src/org/thoughtcrime/securesms/preferences/MmsPreferencesFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/MmsPreferencesFragment.java @@ -19,7 +19,7 @@ package org.thoughtcrime.securesms.preferences; import android.content.Context; import android.os.AsyncTask; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity; import network.loki.messenger.R; diff --git a/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java index b3ddb9cd1b..179d3c35f2 100644 --- a/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java @@ -9,14 +9,13 @@ import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; import android.provider.Settings; -import android.support.annotation.Nullable; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.Preference; +import androidx.annotation.Nullable; +import androidx.preference.ListPreference; +import androidx.preference.Preference; import android.text.TextUtils; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.components.SwitchPreferenceCompat; -import org.thoughtcrime.securesms.notifications.MessageNotifier; import org.thoughtcrime.securesms.notifications.NotificationChannels; import org.thoughtcrime.securesms.util.TextSecurePreferences; diff --git a/src/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java index d01ec1389f..3681c6e7ec 100644 --- a/src/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java @@ -2,18 +2,17 @@ package org.thoughtcrime.securesms.preferences; import android.content.Context; import android.content.Intent; -import android.os.Build; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.provider.Settings; import android.provider.Telephony; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceScreen; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; +import androidx.preference.Preference; +import androidx.preference.PreferenceScreen; import org.thoughtcrime.securesms.ApplicationPreferencesActivity; import network.loki.messenger.R; diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreference.java b/src/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreference.java index 9754b7c1f6..1cccf1d524 100644 --- a/src/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreference.java +++ b/src/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreference.java @@ -5,10 +5,10 @@ import android.content.Context; import android.content.res.TypedArray; import android.graphics.Color; import android.graphics.drawable.Drawable; -import android.support.v4.content.ContextCompat; -import android.support.v4.content.res.TypedArrayUtils; -import android.support.v7.preference.DialogPreference; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.core.content.ContextCompat; +import androidx.core.content.res.TypedArrayUtils; +import androidx.preference.DialogPreference; +import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.widget.ImageView; diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreferenceDialogFragmentCompat.java b/src/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreferenceDialogFragmentCompat.java index c781c53cdf..964f439ba1 100644 --- a/src/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreferenceDialogFragmentCompat.java +++ b/src/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreferenceDialogFragmentCompat.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.preferences.widgets; import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.preference.PreferenceDialogFragmentCompat; +import androidx.annotation.NonNull; +import androidx.preference.PreferenceDialogFragmentCompat; import com.takisoft.colorpicker.ColorPickerDialog; import com.takisoft.colorpicker.OnColorSelectedListener; diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java b/src/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java index 7ac8abfb81..80dd7a3791 100644 --- a/src/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java +++ b/src/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.preferences.widgets; import android.content.Context; import android.graphics.PorterDuff; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.widget.ImageView; diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/LEDColorListPreference.java b/src/org/thoughtcrime/securesms/preferences/widgets/LEDColorListPreference.java index 31f71ff82b..075df3a026 100644 --- a/src/org/thoughtcrime/securesms/preferences/widgets/LEDColorListPreference.java +++ b/src/org/thoughtcrime/securesms/preferences/widgets/LEDColorListPreference.java @@ -18,9 +18,9 @@ package org.thoughtcrime.securesms.preferences.widgets; import android.content.Context; import android.graphics.drawable.GradientDrawable; -import android.support.annotation.NonNull; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.annotation.NonNull; +import androidx.preference.ListPreference; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.widget.ImageView; diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java b/src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java index 7edfb89df4..21ad43fdd4 100644 --- a/src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java +++ b/src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java @@ -7,9 +7,9 @@ import android.content.Context; import android.graphics.Outline; import android.graphics.drawable.Drawable; import android.os.Build; -import android.support.annotation.RequiresApi; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.annotation.RequiresApi; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/ProgressPreference.java b/src/org/thoughtcrime/securesms/preferences/widgets/ProgressPreference.java index e8491e0622..52a88c5664 100644 --- a/src/org/thoughtcrime/securesms/preferences/widgets/ProgressPreference.java +++ b/src/org/thoughtcrime/securesms/preferences/widgets/ProgressPreference.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.preferences.widgets; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.widget.TextView; diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/SignalListPreference.java b/src/org/thoughtcrime/securesms/preferences/widgets/SignalListPreference.java index ebc5e2aebd..d8e90db156 100644 --- a/src/org/thoughtcrime/securesms/preferences/widgets/SignalListPreference.java +++ b/src/org/thoughtcrime/securesms/preferences/widgets/SignalListPreference.java @@ -3,17 +3,14 @@ package org.thoughtcrime.securesms.preferences.widgets; import android.content.Context; import android.os.Build; -import android.support.annotation.RequiresApi; -import android.support.v7.preference.ListPreference; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.annotation.RequiresApi; +import androidx.preference.ListPreference; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; -import android.util.TypedValue; -import android.view.View; import android.widget.TextView; import network.loki.messenger.R; -import org.thoughtcrime.securesms.util.ViewUtil; public class SignalListPreference extends ListPreference { diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/SignalPreference.java b/src/org/thoughtcrime/securesms/preferences/widgets/SignalPreference.java index c7d30b2cf6..90635d6d5b 100644 --- a/src/org/thoughtcrime/securesms/preferences/widgets/SignalPreference.java +++ b/src/org/thoughtcrime/securesms/preferences/widgets/SignalPreference.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.preferences.widgets; import android.content.Context; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.Preference; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.widget.TextView; diff --git a/src/org/thoughtcrime/securesms/profiles/AvatarHelper.java b/src/org/thoughtcrime/securesms/profiles/AvatarHelper.java index 8ff17b3518..572ae4ab6d 100644 --- a/src/org/thoughtcrime/securesms/profiles/AvatarHelper.java +++ b/src/org/thoughtcrime/securesms/profiles/AvatarHelper.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.profiles; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/profiles/GroupShareProfileView.java b/src/org/thoughtcrime/securesms/profiles/GroupShareProfileView.java index ac8bf899ff..c403aef634 100644 --- a/src/org/thoughtcrime/securesms/profiles/GroupShareProfileView.java +++ b/src/org/thoughtcrime/securesms/profiles/GroupShareProfileView.java @@ -3,12 +3,12 @@ package org.thoughtcrime.securesms.profiles; import android.content.Context; import android.os.Build; -import android.support.annotation.AttrRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; -import android.support.annotation.StyleRes; -import android.support.v7.app.AlertDialog; +import androidx.annotation.AttrRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; +import androidx.annotation.StyleRes; +import androidx.appcompat.app.AlertDialog; import android.util.AttributeSet; import android.view.View; import android.widget.FrameLayout; diff --git a/src/org/thoughtcrime/securesms/profiles/SystemProfileUtil.java b/src/org/thoughtcrime/securesms/profiles/SystemProfileUtil.java index 723034ed4b..b75012e246 100644 --- a/src/org/thoughtcrime/securesms/profiles/SystemProfileUtil.java +++ b/src/org/thoughtcrime/securesms/profiles/SystemProfileUtil.java @@ -8,10 +8,9 @@ import android.content.Context; import android.database.Cursor; import android.net.Uri; import android.os.AsyncTask; -import android.os.Build; import android.provider.ContactsContract; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import org.thoughtcrime.securesms.logging.Log; diff --git a/src/org/thoughtcrime/securesms/profiles/UnknownSenderView.java b/src/org/thoughtcrime/securesms/profiles/UnknownSenderView.java index 8652141127..d3f2a57bf8 100644 --- a/src/org/thoughtcrime/securesms/profiles/UnknownSenderView.java +++ b/src/org/thoughtcrime/securesms/profiles/UnknownSenderView.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.profiles; import android.content.Context; import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.appcompat.app.AlertDialog; import android.view.View; import android.widget.FrameLayout; diff --git a/src/org/thoughtcrime/securesms/providers/BlobProvider.java b/src/org/thoughtcrime/securesms/providers/BlobProvider.java index b3d9e374f4..37e130a588 100644 --- a/src/org/thoughtcrime/securesms/providers/BlobProvider.java +++ b/src/org/thoughtcrime/securesms/providers/BlobProvider.java @@ -4,10 +4,10 @@ import android.app.Application; import android.content.Context; import android.content.UriMatcher; import android.net.Uri; -import android.support.annotation.IntRange; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.IntRange; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import org.thoughtcrime.securesms.crypto.AttachmentSecret; import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider; diff --git a/src/org/thoughtcrime/securesms/providers/DeprecatedPersistentBlobProvider.java b/src/org/thoughtcrime/securesms/providers/DeprecatedPersistentBlobProvider.java index 178dc2a4b6..07ea7bba46 100644 --- a/src/org/thoughtcrime/securesms/providers/DeprecatedPersistentBlobProvider.java +++ b/src/org/thoughtcrime/securesms/providers/DeprecatedPersistentBlobProvider.java @@ -4,8 +4,8 @@ import android.content.ContentUris; import android.content.Context; import android.content.UriMatcher; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.webkit.MimeTypeMap; import org.thoughtcrime.securesms.crypto.AttachmentSecret; diff --git a/src/org/thoughtcrime/securesms/providers/MmsBodyProvider.java b/src/org/thoughtcrime/securesms/providers/MmsBodyProvider.java index 03c603e326..92f6ade1b6 100644 --- a/src/org/thoughtcrime/securesms/providers/MmsBodyProvider.java +++ b/src/org/thoughtcrime/securesms/providers/MmsBodyProvider.java @@ -24,7 +24,7 @@ import android.content.UriMatcher; import android.database.Cursor; import android.net.Uri; import android.os.ParcelFileDescriptor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.logging.Log; diff --git a/src/org/thoughtcrime/securesms/providers/PartProvider.java b/src/org/thoughtcrime/securesms/providers/PartProvider.java index 7b50c5493f..b9a10d0e28 100644 --- a/src/org/thoughtcrime/securesms/providers/PartProvider.java +++ b/src/org/thoughtcrime/securesms/providers/PartProvider.java @@ -26,7 +26,7 @@ import android.net.Uri; import android.os.MemoryFile; import android.os.ParcelFileDescriptor; import android.provider.OpenableColumns; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.attachments.AttachmentId; diff --git a/src/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.java b/src/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.java index 97fb2e0ecb..150d12cfa8 100644 --- a/src/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.java +++ b/src/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.push; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.whispersystems.signalservice.api.push.TrustStore; diff --git a/src/org/thoughtcrime/securesms/qr/QrCode.java b/src/org/thoughtcrime/securesms/qr/QrCode.java index 65574aba20..ed0ccee8d3 100644 --- a/src/org/thoughtcrime/securesms/qr/QrCode.java +++ b/src/org/thoughtcrime/securesms/qr/QrCode.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.qr; import android.graphics.Bitmap; import android.graphics.Color; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.google.zxing.BarcodeFormat; import com.google.zxing.EncodeHintType; diff --git a/src/org/thoughtcrime/securesms/qr/ScanningThread.java b/src/org/thoughtcrime/securesms/qr/ScanningThread.java index 00dde4693a..4fddaf871f 100644 --- a/src/org/thoughtcrime/securesms/qr/ScanningThread.java +++ b/src/org/thoughtcrime/securesms/qr/ScanningThread.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.qr; import android.content.res.Configuration; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.zxing.BinaryBitmap; import com.google.zxing.ChecksumException; diff --git a/src/org/thoughtcrime/securesms/recipients/Recipient.java b/src/org/thoughtcrime/securesms/recipients/Recipient.java index ca78ea9e84..37fb87eaf0 100644 --- a/src/org/thoughtcrime/securesms/recipients/Recipient.java +++ b/src/org/thoughtcrime/securesms/recipients/Recipient.java @@ -20,8 +20,8 @@ package org.thoughtcrime.securesms.recipients; import android.content.Context; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.annimon.stream.function.Consumer; diff --git a/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java b/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java index 8353a97766..c1f80d8043 100644 --- a/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java +++ b/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java @@ -18,8 +18,8 @@ package org.thoughtcrime.securesms.recipients; import android.content.Context; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import network.loki.messenger.R; diff --git a/src/org/thoughtcrime/securesms/registration/CaptchaActivity.java b/src/org/thoughtcrime/securesms/registration/CaptchaActivity.java index 79fb6d1fa3..cb8b15d941 100644 --- a/src/org/thoughtcrime/securesms/registration/CaptchaActivity.java +++ b/src/org/thoughtcrime/securesms/registration/CaptchaActivity.java @@ -4,20 +4,8 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; -import android.content.Context; -import android.content.Intent; -import android.graphics.Bitmap; -import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.text.TextUtils; -import android.webkit.ValueCallback; -import android.webkit.WebChromeClient; -import android.webkit.WebResourceRequest; -import android.webkit.WebResourceResponse; -import android.webkit.WebSettings; import android.webkit.WebView; import android.webkit.WebViewClient; diff --git a/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java b/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java index d0ce12f074..3f56db3525 100644 --- a/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java +++ b/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java @@ -5,7 +5,7 @@ import android.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.BaseActionBarActivity; import org.thoughtcrime.securesms.permissions.Permissions; diff --git a/src/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java b/src/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java index 7db935c521..ef369bbb13 100644 --- a/src/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java +++ b/src/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java @@ -4,9 +4,9 @@ import android.content.Intent; import android.graphics.Paint; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java b/src/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java index 6f5ee52bb3..a40e0d72a6 100644 --- a/src/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java +++ b/src/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java @@ -2,10 +2,10 @@ package org.thoughtcrime.securesms.scribbles; import android.content.Context; import android.graphics.Color; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.view.View; import android.widget.ImageView; diff --git a/src/org/thoughtcrime/securesms/scribbles/StickerLoader.java b/src/org/thoughtcrime/securesms/scribbles/StickerLoader.java index d1dd09c56f..f3c6c4fdc7 100644 --- a/src/org/thoughtcrime/securesms/scribbles/StickerLoader.java +++ b/src/org/thoughtcrime/securesms/scribbles/StickerLoader.java @@ -18,7 +18,7 @@ package org.thoughtcrime.securesms.scribbles; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.AsyncLoader; diff --git a/src/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java b/src/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java index 53a1a1eea8..fd2937a5ac 100644 --- a/src/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java +++ b/src/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java @@ -18,13 +18,13 @@ package org.thoughtcrime.securesms.scribbles; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.annotation.Nullable; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.viewpager.widget.ViewPager; import android.view.MenuItem; import network.loki.messenger.R; diff --git a/src/org/thoughtcrime/securesms/scribbles/StickerSelectFragment.java b/src/org/thoughtcrime/securesms/scribbles/StickerSelectFragment.java index 4fb891c81e..4a1ee2453d 100644 --- a/src/org/thoughtcrime/securesms/scribbles/StickerSelectFragment.java +++ b/src/org/thoughtcrime/securesms/scribbles/StickerSelectFragment.java @@ -19,13 +19,13 @@ package org.thoughtcrime.securesms.scribbles; import android.content.Context; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.Loader; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java b/src/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java index cc6e9778ff..598975c18e 100644 --- a/src/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java +++ b/src/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java @@ -8,8 +8,8 @@ import android.graphics.Point; import android.graphics.RectF; import android.net.Uri; import android.os.Parcel; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.request.target.SimpleTarget; diff --git a/src/org/thoughtcrime/securesms/scribbles/widget/ColorPaletteAdapter.java b/src/org/thoughtcrime/securesms/scribbles/widget/ColorPaletteAdapter.java index 105c0e2d50..651d2d8b13 100644 --- a/src/org/thoughtcrime/securesms/scribbles/widget/ColorPaletteAdapter.java +++ b/src/org/thoughtcrime/securesms/scribbles/widget/ColorPaletteAdapter.java @@ -1,9 +1,9 @@ package org.thoughtcrime.securesms.scribbles.widget; import android.graphics.PorterDuff; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/search/SearchFragment.java b/src/org/thoughtcrime/securesms/search/SearchFragment.java index ead6cd6c66..71a3665ccb 100644 --- a/src/org/thoughtcrime/securesms/search/SearchFragment.java +++ b/src/org/thoughtcrime/securesms/search/SearchFragment.java @@ -1,15 +1,15 @@ package org.thoughtcrime.securesms.search; import android.annotation.SuppressLint; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.content.Intent; import android.os.AsyncTask; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.text.TextUtils; import android.view.LayoutInflater; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/search/SearchListAdapter.java b/src/org/thoughtcrime/securesms/search/SearchListAdapter.java index 0fbba7c31c..141c6ea564 100644 --- a/src/org/thoughtcrime/securesms/search/SearchListAdapter.java +++ b/src/org/thoughtcrime/securesms/search/SearchListAdapter.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.search; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/search/SearchRepository.java b/src/org/thoughtcrime/securesms/search/SearchRepository.java index 46b47128f7..ab3f90a788 100644 --- a/src/org/thoughtcrime/securesms/search/SearchRepository.java +++ b/src/org/thoughtcrime/securesms/search/SearchRepository.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.search; import android.content.Context; import android.database.Cursor; import android.database.DatabaseUtils; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/search/SearchViewModel.java b/src/org/thoughtcrime/securesms/search/SearchViewModel.java index 592e46ad6e..7c307717f2 100644 --- a/src/org/thoughtcrime/securesms/search/SearchViewModel.java +++ b/src/org/thoughtcrime/securesms/search/SearchViewModel.java @@ -1,14 +1,16 @@ package org.thoughtcrime.securesms.search; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.MutableLiveData; -import android.arch.lifecycle.ViewModel; -import android.arch.lifecycle.ViewModelProvider; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; +import androidx.lifecycle.ViewModelProvider; import android.database.ContentObserver; import android.os.Handler; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; +import androidx.fragment.app.Fragment; + import org.thoughtcrime.securesms.search.model.SearchResult; import org.thoughtcrime.securesms.util.Debouncer; import org.thoughtcrime.securesms.util.Util; @@ -19,7 +21,7 @@ import org.thoughtcrime.securesms.util.Util; * * This class should be view- and Android-agnostic, and therefore should contain no references to * things like {@link android.content.Context}, {@link android.view.View}, - * {@link android.support.v4.app.Fragment}, etc. + * {@link Fragment}, etc. */ class SearchViewModel extends ViewModel { diff --git a/src/org/thoughtcrime/securesms/search/model/MessageResult.java b/src/org/thoughtcrime/securesms/search/model/MessageResult.java index 2e8aaf3d11..b936109744 100644 --- a/src/org/thoughtcrime/securesms/search/model/MessageResult.java +++ b/src/org/thoughtcrime/securesms/search/model/MessageResult.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.search.model; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.recipients.Recipient; diff --git a/src/org/thoughtcrime/securesms/search/model/SearchResult.java b/src/org/thoughtcrime/securesms/search/model/SearchResult.java index 9c2577125d..66d00a8429 100644 --- a/src/org/thoughtcrime/securesms/search/model/SearchResult.java +++ b/src/org/thoughtcrime/securesms/search/model/SearchResult.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.search.model; import android.database.ContentObserver; -import android.database.DataSetObserver; -import android.support.annotation.NonNull; + +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.database.CursorList; import org.thoughtcrime.securesms.database.model.ThreadRecord; diff --git a/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java b/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java index 2a35649e74..dfd8de2747 100644 --- a/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java +++ b/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java @@ -14,7 +14,7 @@ import android.os.Handler; import android.os.IBinder; import android.os.PowerManager; import android.os.PowerManager.WakeLock; -import android.support.v4.app.NotificationCompat; +import androidx.core.app.NotificationCompat; import org.thoughtcrime.securesms.database.SmsMigrator; import org.thoughtcrime.securesms.database.SmsMigrator.ProgressDescription; diff --git a/src/org/thoughtcrime/securesms/service/DirectShareService.java b/src/org/thoughtcrime/securesms/service/DirectShareService.java index 44e6a0421c..7604bb08f6 100644 --- a/src/org/thoughtcrime/securesms/service/DirectShareService.java +++ b/src/org/thoughtcrime/securesms/service/DirectShareService.java @@ -11,8 +11,8 @@ import android.os.Bundle; import android.os.Parcel; import android.service.chooser.ChooserTarget; import android.service.chooser.ChooserTargetService; -import android.support.annotation.NonNull; -import android.support.annotation.RequiresApi; +import androidx.annotation.NonNull; +import androidx.annotation.RequiresApi; import org.thoughtcrime.securesms.ShareActivity; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/src/org/thoughtcrime/securesms/service/GenericForegroundService.java b/src/org/thoughtcrime/securesms/service/GenericForegroundService.java index 5687869c00..9b30041463 100644 --- a/src/org/thoughtcrime/securesms/service/GenericForegroundService.java +++ b/src/org/thoughtcrime/securesms/service/GenericForegroundService.java @@ -6,11 +6,11 @@ import android.app.Service; import android.content.Context; import android.content.Intent; import android.os.IBinder; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.NotificationCompat; -import android.support.v4.content.ContextCompat; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; +import androidx.core.content.ContextCompat; import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.loki.activities.HomeActivity; diff --git a/src/org/thoughtcrime/securesms/service/IncomingMessageObserver.java b/src/org/thoughtcrime/securesms/service/IncomingMessageObserver.java index cfc9215cee..315beb2fdd 100644 --- a/src/org/thoughtcrime/securesms/service/IncomingMessageObserver.java +++ b/src/org/thoughtcrime/securesms/service/IncomingMessageObserver.java @@ -1,16 +1,16 @@ package org.thoughtcrime.securesms.service; import android.app.Service; -import android.arch.lifecycle.DefaultLifecycleObserver; -import android.arch.lifecycle.LifecycleOwner; -import android.arch.lifecycle.ProcessLifecycleOwner; +import androidx.lifecycle.DefaultLifecycleObserver; +import androidx.lifecycle.LifecycleOwner; +import androidx.lifecycle.ProcessLifecycleOwner; import android.content.Context; import android.content.Intent; import android.os.IBinder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.NotificationCompat; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; +import androidx.core.content.ContextCompat; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.dependencies.InjectableType; diff --git a/src/org/thoughtcrime/securesms/service/KeyCachingService.java b/src/org/thoughtcrime/securesms/service/KeyCachingService.java index b07710e730..aae8b49377 100644 --- a/src/org/thoughtcrime/securesms/service/KeyCachingService.java +++ b/src/org/thoughtcrime/securesms/service/KeyCachingService.java @@ -27,9 +27,9 @@ import android.os.AsyncTask; import android.os.Binder; import android.os.IBinder; import android.os.SystemClock; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.NotificationCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.DatabaseUpgradeActivity; @@ -39,7 +39,6 @@ import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.crypto.MasterSecretUtil; import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.loki.activities.HomeActivity; -import org.thoughtcrime.securesms.notifications.MessageNotifier; import org.thoughtcrime.securesms.notifications.NotificationChannels; import org.thoughtcrime.securesms.util.DynamicLanguage; import org.thoughtcrime.securesms.util.ServiceUtil; diff --git a/src/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java b/src/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java index 4d3ce918c9..f7401802ad 100644 --- a/src/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java +++ b/src/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java @@ -9,9 +9,9 @@ import android.content.Context; import android.content.Intent; import android.database.Cursor; import android.net.Uri; -import android.os.Build; -import android.support.annotation.Nullable; -import android.support.v4.app.NotificationCompat; + +import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; import org.thoughtcrime.securesms.logging.Log; import network.loki.messenger.R; diff --git a/src/org/thoughtcrime/securesms/service/WebRtcCallService.java b/src/org/thoughtcrime/securesms/service/WebRtcCallService.java index 855b327131..0841e4f888 100644 --- a/src/org/thoughtcrime/securesms/service/WebRtcCallService.java +++ b/src/org/thoughtcrime/securesms/service/WebRtcCallService.java @@ -1,7 +1,6 @@ package org.thoughtcrime.securesms.service; -import android.Manifest; import android.app.Service; import android.content.BroadcastReceiver; import android.content.Context; @@ -15,9 +14,9 @@ import android.os.Handler; import android.os.HandlerThread; import android.os.IBinder; import android.os.ResultReceiver; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import android.telephony.PhoneStateListener; import android.telephony.TelephonyManager; import android.util.Pair; @@ -27,7 +26,6 @@ import com.google.protobuf.InvalidProtocolBufferException; import org.greenrobot.eventbus.EventBus; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.WebRtcCallActivity; -import org.thoughtcrime.securesms.contacts.ContactAccessor; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; @@ -35,8 +33,6 @@ import org.thoughtcrime.securesms.database.RecipientDatabase.VibrateState; import org.thoughtcrime.securesms.dependencies.InjectableType; import org.thoughtcrime.securesms.events.WebRtcViewModel; import org.thoughtcrime.securesms.logging.Log; -import org.thoughtcrime.securesms.notifications.MessageNotifier; -import org.thoughtcrime.securesms.permissions.Permissions; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.FutureTaskListener; import org.thoughtcrime.securesms.util.ListenableFutureTask; diff --git a/src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java b/src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java index 1c787355c3..612ea7a863 100644 --- a/src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java +++ b/src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.sms; import android.content.Context; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.telephony.SmsMessage; import org.thoughtcrime.securesms.database.Address; diff --git a/src/org/thoughtcrime/securesms/sms/MessageSender.java b/src/org/thoughtcrime/securesms/sms/MessageSender.java index 9f16df5c7c..3deb7565dd 100644 --- a/src/org/thoughtcrime/securesms/sms/MessageSender.java +++ b/src/org/thoughtcrime/securesms/sms/MessageSender.java @@ -17,7 +17,7 @@ package org.thoughtcrime.securesms.sms; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.attachments.Attachment; diff --git a/src/org/thoughtcrime/securesms/stickers/BlessedPacks.java b/src/org/thoughtcrime/securesms/stickers/BlessedPacks.java index b67a45ebcf..9aa2a3b46c 100644 --- a/src/org/thoughtcrime/securesms/stickers/BlessedPacks.java +++ b/src/org/thoughtcrime/securesms/stickers/BlessedPacks.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.stickers; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.HashSet; import java.util.Set; diff --git a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageAdapter.java b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageAdapter.java index b53382d86c..155e264c78 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageAdapter.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageAdapter.java @@ -1,9 +1,9 @@ package org.thoughtcrime.securesms.stickers; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.Px; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.Px; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageFragment.java b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageFragment.java index 837fa5304c..f273c31a80 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageFragment.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageFragment.java @@ -1,16 +1,16 @@ package org.thoughtcrime.securesms.stickers; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.content.Context; import android.content.res.Configuration; import android.graphics.Point; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.Px; -import android.support.v4.app.Fragment; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.Px; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.Gravity; import android.view.LayoutInflater; import android.view.MotionEvent; diff --git a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java index b602a93645..23c31089ac 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java @@ -1,17 +1,16 @@ package org.thoughtcrime.securesms.stickers; import android.app.Application; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.MutableLiveData; -import android.arch.lifecycle.ViewModel; -import android.arch.lifecycle.ViewModelProvider; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; +import androidx.lifecycle.ViewModelProvider; import android.database.ContentObserver; import android.os.Handler; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.database.DatabaseContentProviders; import org.thoughtcrime.securesms.database.model.StickerRecord; -import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.Throttler; import java.util.List; diff --git a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java index 0f37fcf12e..27a7bfd7c3 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java @@ -1,15 +1,15 @@ package org.thoughtcrime.securesms.stickers; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.content.Context; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.appcompat.app.AppCompatActivity; import android.widget.ImageView; import org.thoughtcrime.securesms.components.emoji.MediaKeyboardProvider; diff --git a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardRepository.java b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardRepository.java index 891da94810..d1d8648226 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardRepository.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardRepository.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.stickers; import android.database.Cursor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.database.StickerDatabase; import org.thoughtcrime.securesms.database.StickerDatabase.StickerPackRecordReader; diff --git a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java index 2833f554a8..0c1c2d5391 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java @@ -1,13 +1,13 @@ package org.thoughtcrime.securesms.stickers; import android.app.Application; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.MutableLiveData; -import android.arch.lifecycle.ViewModel; -import android.arch.lifecycle.ViewModelProvider; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; +import androidx.lifecycle.ViewModelProvider; import android.database.ContentObserver; import android.os.Handler; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.database.DatabaseContentProviders; import org.thoughtcrime.securesms.stickers.StickerKeyboardRepository.PackListResult; diff --git a/src/org/thoughtcrime/securesms/stickers/StickerLocator.java b/src/org/thoughtcrime/securesms/stickers/StickerLocator.java index 68a8ed972d..ecb99e2a88 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerLocator.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerLocator.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.stickers; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class StickerLocator implements Parcelable { diff --git a/src/org/thoughtcrime/securesms/stickers/StickerManagementActivity.java b/src/org/thoughtcrime/securesms/stickers/StickerManagementActivity.java index e2c5795308..d814b86958 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerManagementActivity.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerManagementActivity.java @@ -1,12 +1,12 @@ package org.thoughtcrime.securesms.stickers; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.MenuItem; import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity; diff --git a/src/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java b/src/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java index 6670ade315..77e3ee8ee5 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.stickers; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java b/src/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java index 4208ac0cf8..2dc5abf900 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.stickers; import android.content.Context; import android.database.Cursor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.database.AttachmentDatabase; diff --git a/src/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.java b/src/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.java index 062954bd43..2135deae16 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.java @@ -1,13 +1,13 @@ package org.thoughtcrime.securesms.stickers; import android.app.Application; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.MutableLiveData; -import android.arch.lifecycle.ViewModel; -import android.arch.lifecycle.ViewModelProvider; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; +import androidx.lifecycle.ViewModelProvider; import android.database.ContentObserver; import android.os.Handler; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.database.DatabaseContentProviders; import org.thoughtcrime.securesms.stickers.StickerManagementRepository.PackResult; diff --git a/src/org/thoughtcrime/securesms/stickers/StickerManifest.java b/src/org/thoughtcrime/securesms/stickers/StickerManifest.java index 63444a87fa..77b5c5c3c3 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerManifest.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerManifest.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.stickers; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.whispersystems.libsignal.util.guava.Optional; diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPackInstallEvent.java b/src/org/thoughtcrime/securesms/stickers/StickerPackInstallEvent.java index b315d67522..22b2505dae 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerPackInstallEvent.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerPackInstallEvent.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.stickers; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class StickerPackInstallEvent { private final Object iconGlideModel; diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java index 5072aae05e..74350d36dc 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java @@ -1,15 +1,15 @@ package org.thoughtcrime.securesms.stickers; -import android.arch.lifecycle.ViewModelProviders; +import androidx.lifecycle.ViewModelProviders; import android.content.Intent; import android.content.res.Configuration; import android.graphics.Point; import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; import android.view.View; import android.widget.ImageView; import android.widget.TextView; diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewAdapter.java b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewAdapter.java index 5ba235ef68..1d5e675487 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewAdapter.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewAdapter.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.stickers; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java index 9ef5b4a0f3..8c89422ac6 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.stickers; import android.content.Context; import android.database.Cursor; -import android.support.annotation.NonNull; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.WorkerThread; import com.annimon.stream.Stream; diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java index cf95b28ca5..b99e75bbc7 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java @@ -1,13 +1,13 @@ package org.thoughtcrime.securesms.stickers; import android.app.Application; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.MutableLiveData; -import android.arch.lifecycle.ViewModel; -import android.arch.lifecycle.ViewModelProvider; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.ViewModel; +import androidx.lifecycle.ViewModelProvider; import android.database.ContentObserver; import android.os.Handler; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import org.thoughtcrime.securesms.database.DatabaseContentProviders; diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPreviewPopup.java b/src/org/thoughtcrime/securesms/stickers/StickerPreviewPopup.java index a13fe3c2e2..cac515af05 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerPreviewPopup.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerPreviewPopup.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.stickers; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.LayoutInflater; import android.view.ViewGroup; import android.widget.ImageView; diff --git a/src/org/thoughtcrime/securesms/stickers/StickerRemoteUri.java b/src/org/thoughtcrime/securesms/stickers/StickerRemoteUri.java index b4845c2e42..5b5733ec49 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerRemoteUri.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerRemoteUri.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.stickers; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.bumptech.glide.load.Key; diff --git a/src/org/thoughtcrime/securesms/stickers/StickerRemoteUriFetcher.java b/src/org/thoughtcrime/securesms/stickers/StickerRemoteUriFetcher.java index f75c538838..051e862b70 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerRemoteUriFetcher.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerRemoteUriFetcher.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.stickers; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.bumptech.glide.Priority; import com.bumptech.glide.load.DataSource; diff --git a/src/org/thoughtcrime/securesms/stickers/StickerRemoteUriLoader.java b/src/org/thoughtcrime/securesms/stickers/StickerRemoteUriLoader.java index b17772f870..89fcc52214 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerRemoteUriLoader.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerRemoteUriLoader.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.stickers; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.bumptech.glide.load.Options; import com.bumptech.glide.load.model.ModelLoader; diff --git a/src/org/thoughtcrime/securesms/stickers/StickerSearchRepository.java b/src/org/thoughtcrime/securesms/stickers/StickerSearchRepository.java index eea9cba3e7..d9bde9b461 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerSearchRepository.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerSearchRepository.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.stickers; import android.content.Context; import android.database.Cursor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.database.AttachmentDatabase; import org.thoughtcrime.securesms.database.CursorList; diff --git a/src/org/thoughtcrime/securesms/stickers/StickerUrl.java b/src/org/thoughtcrime/securesms/stickers/StickerUrl.java index ac47f5223a..e20adfbefa 100644 --- a/src/org/thoughtcrime/securesms/stickers/StickerUrl.java +++ b/src/org/thoughtcrime/securesms/stickers/StickerUrl.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.stickers; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import org.whispersystems.libsignal.util.Pair; diff --git a/src/org/thoughtcrime/securesms/util/AbstractCursorLoader.java b/src/org/thoughtcrime/securesms/util/AbstractCursorLoader.java index 1e0e550c8f..b8fbef3803 100644 --- a/src/org/thoughtcrime/securesms/util/AbstractCursorLoader.java +++ b/src/org/thoughtcrime/securesms/util/AbstractCursorLoader.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.util; import android.annotation.SuppressLint; import android.content.Context; import android.database.Cursor; -import android.support.v4.content.AsyncTaskLoader; +import androidx.loader.content.AsyncTaskLoader; /** * A Loader similar to CursorLoader that doesn't require queries to go through the ContentResolver diff --git a/src/org/thoughtcrime/securesms/util/AsyncLoader.java b/src/org/thoughtcrime/securesms/util/AsyncLoader.java index 4ca7d67ff4..c585250526 100644 --- a/src/org/thoughtcrime/securesms/util/AsyncLoader.java +++ b/src/org/thoughtcrime/securesms/util/AsyncLoader.java @@ -16,7 +16,7 @@ package org.thoughtcrime.securesms.util; * limitations under the License. */ -import android.support.v4.content.AsyncTaskLoader; +import androidx.loader.content.AsyncTaskLoader; import android.content.Context; /** diff --git a/src/org/thoughtcrime/securesms/util/AttachmentUtil.java b/src/org/thoughtcrime/securesms/util/AttachmentUtil.java index 1974b50926..8647440449 100644 --- a/src/org/thoughtcrime/securesms/util/AttachmentUtil.java +++ b/src/org/thoughtcrime/securesms/util/AttachmentUtil.java @@ -5,9 +5,9 @@ import android.content.Context; import android.database.Cursor; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import android.text.TextUtils; import org.thoughtcrime.securesms.attachments.AttachmentId; diff --git a/src/org/thoughtcrime/securesms/util/BackupUtil.java b/src/org/thoughtcrime/securesms/util/BackupUtil.java index 46f6684e4c..d3b4f4a112 100644 --- a/src/org/thoughtcrime/securesms/util/BackupUtil.java +++ b/src/org/thoughtcrime/securesms/util/BackupUtil.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.util; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.logging.Log; import network.loki.messenger.R; diff --git a/src/org/thoughtcrime/securesms/util/BitmapUtil.java b/src/org/thoughtcrime/securesms/util/BitmapUtil.java index 90a51d9720..116baf7003 100644 --- a/src/org/thoughtcrime/securesms/util/BitmapUtil.java +++ b/src/org/thoughtcrime/securesms/util/BitmapUtil.java @@ -10,10 +10,10 @@ import android.graphics.Rect; import android.graphics.YuvImage; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; -import android.support.media.ExifInterface; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; +import androidx.exifinterface.media.ExifInterface; import android.util.Pair; import com.bumptech.glide.load.engine.DiskCacheStrategy; diff --git a/src/org/thoughtcrime/securesms/util/CharacterCalculator.java b/src/org/thoughtcrime/securesms/util/CharacterCalculator.java index c499c83d78..8bdf2d0c93 100644 --- a/src/org/thoughtcrime/securesms/util/CharacterCalculator.java +++ b/src/org/thoughtcrime/securesms/util/CharacterCalculator.java @@ -17,7 +17,7 @@ package org.thoughtcrime.securesms.util; import android.os.Parcel; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public abstract class CharacterCalculator { diff --git a/src/org/thoughtcrime/securesms/util/CloseableLiveData.java b/src/org/thoughtcrime/securesms/util/CloseableLiveData.java index 93286c39d9..5691b7b088 100644 --- a/src/org/thoughtcrime/securesms/util/CloseableLiveData.java +++ b/src/org/thoughtcrime/securesms/util/CloseableLiveData.java @@ -1,11 +1,11 @@ package org.thoughtcrime.securesms.util; -import android.arch.lifecycle.MutableLiveData; +import androidx.lifecycle.MutableLiveData; import java.io.Closeable; /** - * Implementation of {@link android.arch.lifecycle.LiveData} that will handle closing the contained + * Implementation of {@link androidx.lifecycle.LiveData} that will handle closing the contained * {@link Closeable} when the value changes. */ public class CloseableLiveData extends MutableLiveData { diff --git a/src/org/thoughtcrime/securesms/util/CommunicationActions.java b/src/org/thoughtcrime/securesms/util/CommunicationActions.java index 9cbd256ba9..2c06f714b5 100644 --- a/src/org/thoughtcrime/securesms/util/CommunicationActions.java +++ b/src/org/thoughtcrime/securesms/util/CommunicationActions.java @@ -7,9 +7,9 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.TaskStackBuilder; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.TaskStackBuilder; import android.text.TextUtils; import android.widget.Toast; diff --git a/src/org/thoughtcrime/securesms/util/DateUtils.java b/src/org/thoughtcrime/securesms/util/DateUtils.java index 21081da710..a7fc61fb4f 100644 --- a/src/org/thoughtcrime/securesms/util/DateUtils.java +++ b/src/org/thoughtcrime/securesms/util/DateUtils.java @@ -17,7 +17,7 @@ package org.thoughtcrime.securesms.util; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.format.DateFormat; import java.text.SimpleDateFormat; diff --git a/src/org/thoughtcrime/securesms/util/Dialogs.java b/src/org/thoughtcrime/securesms/util/Dialogs.java index 809fc6a65e..4d92621465 100644 --- a/src/org/thoughtcrime/securesms/util/Dialogs.java +++ b/src/org/thoughtcrime/securesms/util/Dialogs.java @@ -17,7 +17,7 @@ package org.thoughtcrime.securesms.util; import android.content.Context; -import android.support.v7.app.AlertDialog; +import androidx.appcompat.app.AlertDialog; import network.loki.messenger.R; diff --git a/src/org/thoughtcrime/securesms/util/FileProviderUtil.java b/src/org/thoughtcrime/securesms/util/FileProviderUtil.java index 930290e689..629a5b43bc 100644 --- a/src/org/thoughtcrime/securesms/util/FileProviderUtil.java +++ b/src/org/thoughtcrime/securesms/util/FileProviderUtil.java @@ -4,8 +4,8 @@ package org.thoughtcrime.securesms.util; import android.content.Context; import android.net.Uri; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.v4.content.FileProvider; +import androidx.annotation.NonNull; +import androidx.core.content.FileProvider; import java.io.File; diff --git a/src/org/thoughtcrime/securesms/util/GroupUtil.java b/src/org/thoughtcrime/securesms/util/GroupUtil.java index 4b67444384..3792c7b5b2 100644 --- a/src/org/thoughtcrime/securesms/util/GroupUtil.java +++ b/src/org/thoughtcrime/securesms/util/GroupUtil.java @@ -1,9 +1,9 @@ package org.thoughtcrime.securesms.util; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import com.google.protobuf.ByteString; diff --git a/src/org/thoughtcrime/securesms/util/IdentityUtil.java b/src/org/thoughtcrime/securesms/util/IdentityUtil.java index fe5542e9a5..38fa1c3472 100644 --- a/src/org/thoughtcrime/securesms/util/IdentityUtil.java +++ b/src/org/thoughtcrime/securesms/util/IdentityUtil.java @@ -2,9 +2,9 @@ package org.thoughtcrime.securesms.util; import android.content.Context; import android.os.AsyncTask; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore; @@ -17,7 +17,6 @@ import org.thoughtcrime.securesms.database.IdentityDatabase.IdentityRecord; import org.thoughtcrime.securesms.database.MessagingDatabase.InsertResult; import org.thoughtcrime.securesms.database.SmsDatabase; import org.thoughtcrime.securesms.logging.Log; -import org.thoughtcrime.securesms.notifications.MessageNotifier; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.sms.IncomingIdentityDefaultMessage; import org.thoughtcrime.securesms.sms.IncomingIdentityUpdateMessage; diff --git a/src/org/thoughtcrime/securesms/util/IntentUtils.java b/src/org/thoughtcrime/securesms/util/IntentUtils.java index 31295d2406..0eb110ebdc 100644 --- a/src/org/thoughtcrime/securesms/util/IntentUtils.java +++ b/src/org/thoughtcrime/securesms/util/IntentUtils.java @@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.util; import android.content.Context; import android.content.Intent; import android.content.pm.ResolveInfo; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.List; diff --git a/src/org/thoughtcrime/securesms/util/ListenableFutureTask.java b/src/org/thoughtcrime/securesms/util/ListenableFutureTask.java index 56d7a863ad..068772aa4d 100644 --- a/src/org/thoughtcrime/securesms/util/ListenableFutureTask.java +++ b/src/org/thoughtcrime/securesms/util/ListenableFutureTask.java @@ -16,7 +16,7 @@ */ package org.thoughtcrime.securesms.util; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import java.util.LinkedList; import java.util.List; diff --git a/src/org/thoughtcrime/securesms/util/LongClickCopySpan.java b/src/org/thoughtcrime/securesms/util/LongClickCopySpan.java index 93f59a1c2b..ce8439a20d 100644 --- a/src/org/thoughtcrime/securesms/util/LongClickCopySpan.java +++ b/src/org/thoughtcrime/securesms/util/LongClickCopySpan.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.util; import android.annotation.TargetApi; import android.content.ClipData; import android.content.Context; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; import android.text.TextPaint; import android.text.style.URLSpan; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/util/LongClickMovementMethod.java b/src/org/thoughtcrime/securesms/util/LongClickMovementMethod.java index 9506d42750..82077f474d 100644 --- a/src/org/thoughtcrime/securesms/util/LongClickMovementMethod.java +++ b/src/org/thoughtcrime/securesms/util/LongClickMovementMethod.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.util; import android.annotation.SuppressLint; import android.content.Context; import android.graphics.Color; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.text.Layout; import android.text.Selection; import android.text.Spannable; diff --git a/src/org/thoughtcrime/securesms/util/MathUtils.java b/src/org/thoughtcrime/securesms/util/MathUtils.java index 15a049dfeb..93842ea03c 100644 --- a/src/org/thoughtcrime/securesms/util/MathUtils.java +++ b/src/org/thoughtcrime/securesms/util/MathUtils.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.util; import android.graphics.PointF; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class MathUtils { diff --git a/src/org/thoughtcrime/securesms/util/MediaUtil.java b/src/org/thoughtcrime/securesms/util/MediaUtil.java index 9142f2dc80..6163ba16d6 100644 --- a/src/org/thoughtcrime/securesms/util/MediaUtil.java +++ b/src/org/thoughtcrime/securesms/util/MediaUtil.java @@ -5,9 +5,9 @@ import android.content.Context; import android.graphics.Bitmap; import android.net.Uri; import android.provider.MediaStore; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.WorkerThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.WorkerThread; import android.text.TextUtils; import android.util.Pair; import android.webkit.MimeTypeMap; diff --git a/src/org/thoughtcrime/securesms/util/ObservingLiveData.java b/src/org/thoughtcrime/securesms/util/ObservingLiveData.java index e0fd8a11cf..8f5ef26771 100644 --- a/src/org/thoughtcrime/securesms/util/ObservingLiveData.java +++ b/src/org/thoughtcrime/securesms/util/ObservingLiveData.java @@ -1,15 +1,15 @@ package org.thoughtcrime.securesms.util; -import android.arch.lifecycle.MutableLiveData; +import androidx.lifecycle.MutableLiveData; import android.database.ContentObserver; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.database.ObservableContent; import java.io.Closeable; /** - * Implementation of {@link android.arch.lifecycle.LiveData} that will handle closing the contained + * Implementation of {@link androidx.lifecycle.LiveData} that will handle closing the contained * {@link Closeable} when the value changes. */ public class ObservingLiveData extends MutableLiveData { diff --git a/src/org/thoughtcrime/securesms/util/PowerManagerCompat.java b/src/org/thoughtcrime/securesms/util/PowerManagerCompat.java index f4b7f60868..6fa4ba027a 100644 --- a/src/org/thoughtcrime/securesms/util/PowerManagerCompat.java +++ b/src/org/thoughtcrime/securesms/util/PowerManagerCompat.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.util; import android.os.Build; import android.os.PowerManager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class PowerManagerCompat { diff --git a/src/org/thoughtcrime/securesms/util/ResUtil.java b/src/org/thoughtcrime/securesms/util/ResUtil.java index 75b8f707cf..d83c5cbcf4 100644 --- a/src/org/thoughtcrime/securesms/util/ResUtil.java +++ b/src/org/thoughtcrime/securesms/util/ResUtil.java @@ -21,11 +21,11 @@ import android.content.Context; import android.content.res.Resources.Theme; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; -import android.support.annotation.ArrayRes; -import android.support.annotation.AttrRes; -import android.support.annotation.DimenRes; -import android.support.annotation.NonNull; -import android.support.v4.content.ContextCompat; +import androidx.annotation.ArrayRes; +import androidx.annotation.AttrRes; +import androidx.annotation.DimenRes; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; import android.util.TypedValue; public class ResUtil { diff --git a/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java b/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java index a9eefb0250..f1afec8de8 100644 --- a/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java +++ b/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java @@ -4,9 +4,9 @@ import android.content.Context; import android.content.DialogInterface.OnClickListener; import android.media.MediaScannerConnection; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; import android.text.TextUtils; import android.webkit.MimeTypeMap; import android.widget.Toast; diff --git a/src/org/thoughtcrime/securesms/util/SearchUtil.java b/src/org/thoughtcrime/securesms/util/SearchUtil.java index 4125caacf3..25e84c87cd 100644 --- a/src/org/thoughtcrime/securesms/util/SearchUtil.java +++ b/src/org/thoughtcrime/securesms/util/SearchUtil.java @@ -1,10 +1,9 @@ package org.thoughtcrime.securesms.util; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.Spannable; import android.text.SpannableString; -import android.text.Spanned; import android.text.TextUtils; import android.text.style.CharacterStyle; diff --git a/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java b/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java index 4c843409ae..202aa40d8e 100644 --- a/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java +++ b/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.util; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/util/ServiceUtil.java b/src/org/thoughtcrime/securesms/util/ServiceUtil.java index 348df1fd61..dd74ad1d33 100644 --- a/src/org/thoughtcrime/securesms/util/ServiceUtil.java +++ b/src/org/thoughtcrime/securesms/util/ServiceUtil.java @@ -9,9 +9,9 @@ import android.net.ConnectivityManager; import android.os.Build; import android.os.PowerManager; import android.os.Vibrator; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.view.WindowManager; diff --git a/src/org/thoughtcrime/securesms/util/ShortCodeUtil.java b/src/org/thoughtcrime/securesms/util/ShortCodeUtil.java index 8a4a9d9018..da645d548b 100644 --- a/src/org/thoughtcrime/securesms/util/ShortCodeUtil.java +++ b/src/org/thoughtcrime/securesms/util/ShortCodeUtil.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.util; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.HashSet; import java.util.Set; diff --git a/src/org/thoughtcrime/securesms/util/SingleLiveEvent.java b/src/org/thoughtcrime/securesms/util/SingleLiveEvent.java index 9df12bd71b..6526853533 100644 --- a/src/org/thoughtcrime/securesms/util/SingleLiveEvent.java +++ b/src/org/thoughtcrime/securesms/util/SingleLiveEvent.java @@ -16,12 +16,12 @@ package org.thoughtcrime.securesms.util; -import android.arch.lifecycle.LifecycleOwner; -import android.arch.lifecycle.MutableLiveData; -import android.arch.lifecycle.Observer; -import android.support.annotation.MainThread; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.lifecycle.LifecycleOwner; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.Observer; +import androidx.annotation.MainThread; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.logging.Log; @@ -44,7 +44,7 @@ public class SingleLiveEvent extends MutableLiveData { private final AtomicBoolean mPending = new AtomicBoolean(false); @MainThread - public void observe(@NonNull LifecycleOwner owner, @NonNull final Observer observer) { + public void observe(@NonNull LifecycleOwner owner, @NonNull final Observer observer) { if (hasActiveObservers()) { Log.w(TAG, "Multiple observers registered but only one will be notified of changes."); } diff --git a/src/org/thoughtcrime/securesms/util/SoftHashMap.java b/src/org/thoughtcrime/securesms/util/SoftHashMap.java index 5396826263..bff4f3a821 100644 --- a/src/org/thoughtcrime/securesms/util/SoftHashMap.java +++ b/src/org/thoughtcrime/securesms/util/SoftHashMap.java @@ -19,7 +19,7 @@ package org.thoughtcrime.securesms.util; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.lang.ref.ReferenceQueue; import java.lang.ref.SoftReference; diff --git a/src/org/thoughtcrime/securesms/util/StableIdGenerator.java b/src/org/thoughtcrime/securesms/util/StableIdGenerator.java index 7acb9cc2a5..e380f21f95 100644 --- a/src/org/thoughtcrime/securesms/util/StableIdGenerator.java +++ b/src/org/thoughtcrime/securesms/util/StableIdGenerator.java @@ -1,14 +1,16 @@ package org.thoughtcrime.securesms.util; -import android.support.annotation.MainThread; -import android.support.annotation.NonNull; +import androidx.annotation.MainThread; +import androidx.annotation.NonNull; + +import androidx.recyclerview.widget.RecyclerView; import java.util.HashMap; import java.util.Map; /** * Useful for generate ID's to be used with - * {@link android.support.v7.widget.RecyclerView.Adapter#getItemId(int)} when you otherwise don't + * {@link RecyclerView.Adapter#getItemId(int)} when you otherwise don't * have a good way to generate an ID. */ public class StableIdGenerator { diff --git a/src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java b/src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java index 3370528256..04435fde0f 100644 --- a/src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java +++ b/src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java @@ -3,11 +3,11 @@ package org.thoughtcrime.securesms.util; import android.graphics.Canvas; import android.graphics.Rect; import android.os.Build.VERSION; -import android.support.annotation.NonNull; -import android.support.v4.view.ViewCompat; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.ViewHolder; +import androidx.annotation.NonNull; +import androidx.core.view.ViewCompat; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/util/Stopwatch.java b/src/org/thoughtcrime/securesms/util/Stopwatch.java index 58aa34a3c8..b18d474a86 100644 --- a/src/org/thoughtcrime/securesms/util/Stopwatch.java +++ b/src/org/thoughtcrime/securesms/util/Stopwatch.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.util; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.logging.Log; diff --git a/src/org/thoughtcrime/securesms/util/StorageUtil.java b/src/org/thoughtcrime/securesms/util/StorageUtil.java index e08242b8f2..2fbc6c482f 100644 --- a/src/org/thoughtcrime/securesms/util/StorageUtil.java +++ b/src/org/thoughtcrime/securesms/util/StorageUtil.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.util; import android.content.Context; import android.os.Environment; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.database.NoExternalStorageException; diff --git a/src/org/thoughtcrime/securesms/util/TelephonyUtil.java b/src/org/thoughtcrime/securesms/util/TelephonyUtil.java index 3609cc7c7c..e293f8f8af 100644 --- a/src/org/thoughtcrime/securesms/util/TelephonyUtil.java +++ b/src/org/thoughtcrime/securesms/util/TelephonyUtil.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.util; import android.content.Context; import android.content.res.Configuration; import android.net.ConnectivityManager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.telephony.TelephonyManager; import org.thoughtcrime.securesms.logging.Log; diff --git a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java index 669c265c57..f068954296 100644 --- a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java +++ b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java @@ -7,10 +7,10 @@ import android.net.Uri; import android.os.Build; import android.preference.PreferenceManager; import android.provider.Settings; -import android.support.annotation.ArrayRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.NotificationCompat; +import androidx.annotation.ArrayRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; import org.greenrobot.eventbus.EventBus; import org.thoughtcrime.securesms.jobmanager.impl.SqlCipherMigrationConstraintObserver; diff --git a/src/org/thoughtcrime/securesms/util/ThemeUtil.java b/src/org/thoughtcrime/securesms/util/ThemeUtil.java index ccf53cc1ce..564932c57d 100644 --- a/src/org/thoughtcrime/securesms/util/ThemeUtil.java +++ b/src/org/thoughtcrime/securesms/util/ThemeUtil.java @@ -3,10 +3,10 @@ package org.thoughtcrime.securesms.util; import android.content.Context; import android.content.res.Resources; import android.graphics.Color; -import android.support.annotation.AttrRes; -import android.support.annotation.NonNull; -import android.support.annotation.StyleRes; -import android.support.v7.view.ContextThemeWrapper; +import androidx.annotation.AttrRes; +import androidx.annotation.NonNull; +import androidx.annotation.StyleRes; +import androidx.appcompat.view.ContextThemeWrapper; import android.util.TypedValue; import android.view.LayoutInflater; diff --git a/src/org/thoughtcrime/securesms/util/Util.java b/src/org/thoughtcrime/securesms/util/Util.java index 159cf26586..79874325a5 100644 --- a/src/org/thoughtcrime/securesms/util/Util.java +++ b/src/org/thoughtcrime/securesms/util/Util.java @@ -30,8 +30,8 @@ import android.os.Build.VERSION_CODES; import android.os.Handler; import android.os.Looper; import android.provider.Telephony; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.telephony.TelephonyManager; import android.text.Spannable; import android.text.SpannableString; diff --git a/src/org/thoughtcrime/securesms/util/VerifySpan.java b/src/org/thoughtcrime/securesms/util/VerifySpan.java index 0df463de54..c72837b9d6 100644 --- a/src/org/thoughtcrime/securesms/util/VerifySpan.java +++ b/src/org/thoughtcrime/securesms/util/VerifySpan.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.util; import android.content.Context; import android.content.Intent; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.style.ClickableSpan; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/util/VersionTracker.java b/src/org/thoughtcrime/securesms/util/VersionTracker.java index 3c8d06b338..4c9a6ba97a 100644 --- a/src/org/thoughtcrime/securesms/util/VersionTracker.java +++ b/src/org/thoughtcrime/securesms/util/VersionTracker.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.util; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.io.IOException; diff --git a/src/org/thoughtcrime/securesms/util/ViewUtil.java b/src/org/thoughtcrime/securesms/util/ViewUtil.java index d599a8aef4..d119b05ec0 100644 --- a/src/org/thoughtcrime/securesms/util/ViewUtil.java +++ b/src/org/thoughtcrime/securesms/util/ViewUtil.java @@ -22,12 +22,12 @@ import android.content.Context; import android.graphics.drawable.Drawable; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import android.support.annotation.IdRes; -import android.support.annotation.LayoutRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.view.ViewCompat; -import android.support.v4.view.animation.FastOutSlowInInterpolator; +import androidx.annotation.IdRes; +import androidx.annotation.LayoutRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.view.ViewCompat; +import androidx.interpolator.view.animation.FastOutSlowInInterpolator; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/util/WakeLockUtil.java b/src/org/thoughtcrime/securesms/util/WakeLockUtil.java index 6d16e354c6..757f2d5801 100644 --- a/src/org/thoughtcrime/securesms/util/WakeLockUtil.java +++ b/src/org/thoughtcrime/securesms/util/WakeLockUtil.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.util; import android.content.Context; import android.os.PowerManager; import android.os.PowerManager.WakeLock; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.logging.Log; diff --git a/src/org/thoughtcrime/securesms/util/concurrent/SignalExecutors.java b/src/org/thoughtcrime/securesms/util/concurrent/SignalExecutors.java index 4c315843dd..71686a777d 100644 --- a/src/org/thoughtcrime/securesms/util/concurrent/SignalExecutors.java +++ b/src/org/thoughtcrime/securesms/util/concurrent/SignalExecutors.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.util.concurrent; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/src/org/thoughtcrime/securesms/util/concurrent/SimpleTask.java b/src/org/thoughtcrime/securesms/util/concurrent/SimpleTask.java index 3cfb08ae90..5cd24618f9 100644 --- a/src/org/thoughtcrime/securesms/util/concurrent/SimpleTask.java +++ b/src/org/thoughtcrime/securesms/util/concurrent/SimpleTask.java @@ -1,13 +1,11 @@ package org.thoughtcrime.securesms.util.concurrent; -import android.arch.lifecycle.Lifecycle; +import androidx.lifecycle.Lifecycle; import android.os.AsyncTask; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.util.Util; -import java.util.concurrent.Callable; - public class SimpleTask { /** diff --git a/src/org/thoughtcrime/securesms/util/dualsim/SubscriptionInfoCompat.java b/src/org/thoughtcrime/securesms/util/dualsim/SubscriptionInfoCompat.java index f3ef15f413..4a2837668f 100644 --- a/src/org/thoughtcrime/securesms/util/dualsim/SubscriptionInfoCompat.java +++ b/src/org/thoughtcrime/securesms/util/dualsim/SubscriptionInfoCompat.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.util.dualsim; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; public class SubscriptionInfoCompat { diff --git a/src/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java b/src/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java index 2bbfe11c65..26005a5d83 100644 --- a/src/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java +++ b/src/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.util.dualsim; import android.content.Context; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.RequiresApi; +import androidx.annotation.NonNull; +import androidx.annotation.RequiresApi; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; diff --git a/src/org/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageActivityHelper.java b/src/org/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageActivityHelper.java index 8c16f51348..8665377d41 100644 --- a/src/org/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageActivityHelper.java +++ b/src/org/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageActivityHelper.java @@ -1,9 +1,9 @@ package org.thoughtcrime.securesms.util.dynamiclanguage; import android.app.Activity; -import android.content.Intent; -import android.support.annotation.MainThread; -import android.support.v4.os.ConfigurationCompat; + +import androidx.annotation.MainThread; +import androidx.core.os.ConfigurationCompat; import org.thoughtcrime.securesms.logging.Log; diff --git a/src/org/thoughtcrime/securesms/util/dynamiclanguage/LanguageString.java b/src/org/thoughtcrime/securesms/util/dynamiclanguage/LanguageString.java index c3d9f2d870..0c74c2ed6f 100644 --- a/src/org/thoughtcrime/securesms/util/dynamiclanguage/LanguageString.java +++ b/src/org/thoughtcrime/securesms/util/dynamiclanguage/LanguageString.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.util.dynamiclanguage; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.util.Locale; diff --git a/src/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParser.java b/src/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParser.java index a017362e06..80b011894f 100644 --- a/src/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParser.java +++ b/src/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParser.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.util.dynamiclanguage; import android.content.res.Configuration; import android.content.res.Resources; -import android.support.annotation.Nullable; -import android.support.v4.os.ConfigurationCompat; +import androidx.annotation.Nullable; +import androidx.core.os.ConfigurationCompat; import network.loki.messenger.BuildConfig; diff --git a/src/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java b/src/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java index 62bd3874e3..11f2b474dc 100644 --- a/src/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java +++ b/src/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.util.spans; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextPaint; import android.text.style.MetricAffectingSpan; diff --git a/src/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java b/src/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java index b3522c15fa..074e4ed253 100644 --- a/src/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java +++ b/src/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.util.task; import android.app.ProgressDialog; import android.os.AsyncTask; -import android.support.annotation.Nullable; -import android.support.design.widget.Snackbar; +import androidx.annotation.Nullable; +import com.google.android.material.snackbar.Snackbar; import android.view.View; public abstract class SnackbarAsyncTask diff --git a/src/org/thoughtcrime/securesms/util/views/Stub.java b/src/org/thoughtcrime/securesms/util/views/Stub.java index b208bdc62d..eebfdac097 100644 --- a/src/org/thoughtcrime/securesms/util/views/Stub.java +++ b/src/org/thoughtcrime/securesms/util/views/Stub.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.util.views; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.ViewStub; public class Stub { diff --git a/src/org/thoughtcrime/securesms/video/EncryptedMediaDataSource.java b/src/org/thoughtcrime/securesms/video/EncryptedMediaDataSource.java index 89956cf67a..f2e036ed84 100644 --- a/src/org/thoughtcrime/securesms/video/EncryptedMediaDataSource.java +++ b/src/org/thoughtcrime/securesms/video/EncryptedMediaDataSource.java @@ -4,8 +4,8 @@ package org.thoughtcrime.securesms.video; import android.annotation.TargetApi; import android.media.MediaDataSource; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.crypto.AttachmentSecret; import org.thoughtcrime.securesms.crypto.ClassicDecryptingPartInputStream; diff --git a/src/org/thoughtcrime/securesms/video/VideoPlayer.java b/src/org/thoughtcrime/securesms/video/VideoPlayer.java index 13cf819155..dff96b4fab 100644 --- a/src/org/thoughtcrime/securesms/video/VideoPlayer.java +++ b/src/org/thoughtcrime/securesms/video/VideoPlayer.java @@ -18,8 +18,8 @@ package org.thoughtcrime.securesms.video; import android.content.Context; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.View; import android.view.Window; diff --git a/src/org/thoughtcrime/securesms/video/exo/AttachmentDataSourceFactory.java b/src/org/thoughtcrime/securesms/video/exo/AttachmentDataSourceFactory.java index 0d9410f7d0..99a6e28d9b 100644 --- a/src/org/thoughtcrime/securesms/video/exo/AttachmentDataSourceFactory.java +++ b/src/org/thoughtcrime/securesms/video/exo/AttachmentDataSourceFactory.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.video.exo; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; diff --git a/src/org/thoughtcrime/securesms/video/exo/PartDataSource.java b/src/org/thoughtcrime/securesms/video/exo/PartDataSource.java index 78116e5992..e504eff71a 100644 --- a/src/org/thoughtcrime/securesms/video/exo/PartDataSource.java +++ b/src/org/thoughtcrime/securesms/video/exo/PartDataSource.java @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.video.exo; import android.content.Context; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DataSpec; diff --git a/src/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java b/src/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java index 25d2d3992a..ebeb58a87e 100644 --- a/src/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java +++ b/src/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java @@ -4,10 +4,10 @@ import android.app.Notification; import android.app.PendingIntent; import android.content.Context; import android.content.Intent; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.StringRes; -import android.support.v4.app.NotificationCompat; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.StringRes; +import androidx.core.app.NotificationCompat; import org.thoughtcrime.securesms.WebRtcCallActivity; import org.thoughtcrime.securesms.notifications.NotificationChannels; diff --git a/src/org/thoughtcrime/securesms/webrtc/CameraState.java b/src/org/thoughtcrime/securesms/webrtc/CameraState.java index c5b0e25723..b2f5d1ee07 100644 --- a/src/org/thoughtcrime/securesms/webrtc/CameraState.java +++ b/src/org/thoughtcrime/securesms/webrtc/CameraState.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.webrtc; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class CameraState { diff --git a/src/org/thoughtcrime/securesms/webrtc/PeerConnectionWrapper.java b/src/org/thoughtcrime/securesms/webrtc/PeerConnectionWrapper.java index a4bb08dc48..d4e0fdb65d 100644 --- a/src/org/thoughtcrime/securesms/webrtc/PeerConnectionWrapper.java +++ b/src/org/thoughtcrime/securesms/webrtc/PeerConnectionWrapper.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.webrtc; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.concurrent.SettableFuture; diff --git a/src/org/thoughtcrime/securesms/webrtc/audio/BluetoothStateManager.java b/src/org/thoughtcrime/securesms/webrtc/audio/BluetoothStateManager.java index 93c9858f28..853ae15fcb 100644 --- a/src/org/thoughtcrime/securesms/webrtc/audio/BluetoothStateManager.java +++ b/src/org/thoughtcrime/securesms/webrtc/audio/BluetoothStateManager.java @@ -11,9 +11,9 @@ import android.content.Intent; import android.content.IntentFilter; import android.media.AudioManager; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.ServiceUtil; diff --git a/src/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java b/src/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java index e1c96b605f..dfb8fb33a6 100644 --- a/src/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java +++ b/src/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java @@ -8,8 +8,8 @@ import android.media.MediaPlayer; import android.net.Uri; import android.os.Build; import android.os.Vibrator; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.util.ServiceUtil; diff --git a/src/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java b/src/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java index ac6cbe7891..7e2373cc6e 100644 --- a/src/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java +++ b/src/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java @@ -4,7 +4,7 @@ import android.content.Context; import android.media.AudioManager; import android.media.MediaPlayer; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.logging.Log; import network.loki.messenger.R; diff --git a/src/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java b/src/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java index 6ad31f37e3..be5fb9c3a1 100644 --- a/src/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java +++ b/src/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java @@ -5,9 +5,9 @@ import android.content.Context; import android.media.AudioManager; import android.media.SoundPool; import android.net.Uri; -import android.os.Build; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import network.loki.messenger.R; import org.thoughtcrime.securesms.util.ServiceUtil; diff --git a/test/unitTest/java/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapterTest.java b/test/unitTest/java/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapterTest.java index ec61223c36..3fc27d08a2 100644 --- a/test/unitTest/java/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapterTest.java +++ b/test/unitTest/java/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapterTest.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.database; import android.content.Context; import android.database.Cursor; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView.ViewHolder; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.view.View; import android.view.ViewGroup; @@ -12,7 +12,6 @@ import org.junit.Test; import static org.junit.Assert.*; import static org.mockito.Matchers.anyInt; -import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/test/unitTest/java/org/thoughtcrime/securesms/jobs/FastJobStorageTest.java b/test/unitTest/java/org/thoughtcrime/securesms/jobs/FastJobStorageTest.java index 7844aa0672..2198a1c26a 100644 --- a/test/unitTest/java/org/thoughtcrime/securesms/jobs/FastJobStorageTest.java +++ b/test/unitTest/java/org/thoughtcrime/securesms/jobs/FastJobStorageTest.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.jobs; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.annimon.stream.Stream; diff --git a/test/unitTest/java/org/thoughtcrime/securesms/testutil/DirectExecutor.java b/test/unitTest/java/org/thoughtcrime/securesms/testutil/DirectExecutor.java index b602ba25ba..0a573e580c 100644 --- a/test/unitTest/java/org/thoughtcrime/securesms/testutil/DirectExecutor.java +++ b/test/unitTest/java/org/thoughtcrime/securesms/testutil/DirectExecutor.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.testutil; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.concurrent.Executor; From 6de5b25e97b8120ea3581f372577a70c41e0c206 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Wed, 19 Aug 2020 10:18:02 +1000 Subject: [PATCH 2/3] Only externally define versions that are used multiple times --- build.gradle | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index c1b4cc7025..2a8d791677 100644 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,8 @@ import java.security.MessageDigest buildscript { - ext.gradle_version = "3.4.1" ext.kotlin_version = "1.3.31" ext.kovenant_version = "3.3.0" - ext.identicon_version = "v11" - ext.rss_parser_version = "2.0.4" - ext.google_services_version = "4.3.3" - ext.firebase_messaging_version = "18.0.0" - ext.opencsv_version = "4.6" repositories { mavenLocal() @@ -16,10 +10,10 @@ buildscript { mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:$gradle_version" + classpath "com.android.tools.build:gradle:3.4.1" classpath files('libs/gradle-witness.jar') classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath "com.google.gms:google-services:$google_services_version" + classpath "com.google.gms:google-services:4.3.3" } } @@ -91,7 +85,7 @@ dependencies { implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' implementation 'androidx.lifecycle:lifecycle-common-java8:2.0.0' - implementation ("com.google.firebase:firebase-messaging:$firebase_messaging_version") { + implementation ("com.google.firebase:firebase-messaging:18.0.0") { exclude group: 'com.google.firebase', module: 'firebase-core' exclude group: 'com.google.firebase', module: 'firebase-analytics' exclude group: 'com.google.firebase', module: 'firebase-measurement-connector' @@ -187,12 +181,12 @@ dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "nl.komponents.kovenant:kovenant:$kovenant_version" implementation "nl.komponents.kovenant:kovenant-android:$kovenant_version" - implementation "com.github.lelloman:android-identicons:$identicon_version" - implementation "com.prof.rssparser:rssparser:$rss_parser_version" + implementation "com.github.lelloman:android-identicons:v11" + implementation "com.prof.rssparser:rssparser:2.0.4" implementation "com.jakewharton.rxbinding3:rxbinding:3.1.0" implementation "com.github.tbruyelle:rxpermissions:0.10.2" implementation "com.github.ybq:Android-SpinKit:1.4.0" - implementation "com.opencsv:opencsv:$opencsv_version" + implementation "com.opencsv:opencsv:4.6" } def canonicalVersionCode = 65 From 3a1a99b18319a43e44a2caaed2861525a0de34e6 Mon Sep 17 00:00:00 2001 From: nielsandriesse Date: Wed, 19 Aug 2020 10:42:46 +1000 Subject: [PATCH 3/3] Update dependencies --- build.gradle | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index 2a8d791677..8bf64b9d56 100644 --- a/build.gradle +++ b/build.gradle @@ -71,19 +71,19 @@ configurations.all { } dependencies { - implementation 'androidx.appcompat:appcompat:1.0.0' - implementation 'androidx.recyclerview:recyclerview:1.0.0' - implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.recyclerview:recyclerview:1.1.0' + implementation 'com.google.android.material:material:1.2.0' implementation 'androidx.legacy:legacy-support-v13:1.0.0' implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.preference:preference:1.0.0' + implementation 'androidx.preference:preference:1.1.1' implementation 'androidx.legacy:legacy-preference-v14:1.0.0' implementation 'androidx.gridlayout:gridlayout:1.0.0' - implementation 'androidx.exifinterface:exifinterface:1.0.0' + implementation 'androidx.exifinterface:exifinterface:1.2.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation 'androidx.multidex:multidex:2.0.0' - implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' - implementation 'androidx.lifecycle:lifecycle-common-java8:2.0.0' + implementation 'androidx.multidex:multidex:2.0.1' + implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' + implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0' implementation ("com.google.firebase:firebase-messaging:18.0.0") { exclude group: 'com.google.firebase', module: 'firebase-core' @@ -93,12 +93,9 @@ dependencies { implementation 'com.google.android.exoplayer:exoplayer-core:2.9.1' implementation 'com.google.android.exoplayer:exoplayer-ui:2.9.1' - implementation 'org.conscrypt:conscrypt-android:2.0.0' implementation 'org.signal:aesgcmprovider:0.0.3' - implementation 'org.whispersystems:webrtc-android:M74' - implementation "me.leolin:ShortcutBadger:1.1.16" implementation 'se.emilsjolander:stickylistheaders:2.7.0' implementation 'com.jpardogo.materialtabstrip:library:1.0.9' @@ -154,8 +151,8 @@ dependencies { testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.1' testImplementation 'org.powermock:powermock-classloading-xstream:1.6.1' - testImplementation 'androidx.test:core:1.1.1-alpha02' - androidTestImplementation 'androidx.multidex:multidex:2.0.0' + testImplementation 'androidx.test:core:1.3.0-rc03' + androidTestImplementation 'androidx.multidex:multidex:2.0.1' androidTestImplementation 'androidx.multidex:multidex-instrumentation:2.0.0' androidTestImplementation 'com.google.dexmaker:dexmaker:1.2' androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2' @@ -171,10 +168,9 @@ dependencies { // Loki // Local: - implementation "org.whispersystems:signal-service-android:2.13.2" // Run ./gradlew install from loki-messenger-android-service to install + implementation "org.whispersystems:signal-service-android:2.13.2" // Run ./gradlew install from session-android-service to install implementation "org.whispersystems:curve25519-java:0.5.0" // Remote: - // implementation "com.github.loki-project:loki-messenger-android-service:dev-SNAPSHOT" implementation "com.google.protobuf:protobuf-java:2.5.0" implementation "com.fasterxml.jackson.core:jackson-databind:2.9.8" implementation "com.squareup.okhttp3:okhttp:3.12.1"