From b5aa46bb672296a40eb6f5aee555dfa0c402c774 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Wed, 5 Jun 2019 15:47:14 -0400 Subject: [PATCH] Convert to AndroidX. --- AndroidManifest.xml | 2 +- build.gradle | 147 +++++++++--------- gradle.properties | 4 +- res/layout/activity_contact_name_edit.xml | 2 +- res/layout/activity_contact_share_edit.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 | 10 +- .../ApplicationPreferencesActivity.java | 14 +- .../securesms/BaseActionBarActivity.java | 8 +- .../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 +- .../ContactSelectionListFragment.java | 15 +- .../securesms/ConversationListActivity.java | 6 +- .../securesms/ConversationListAdapter.java | 6 +- .../securesms/ConversationListFragment.java | 24 +-- .../securesms/ConversationListItem.java | 4 +- .../securesms/ConversationListItemAction.java | 2 +- .../ConversationListItemInboxZero.java | 6 +- .../securesms/CountrySelectionActivity.java | 1 - .../securesms/CountrySelectionFragment.java | 8 +- .../securesms/CreateProfileActivity.java | 4 +- .../securesms/DatabaseUpgradeActivity.java | 2 +- .../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 | 8 +- .../MessageDetailsRecipientAdapter.java | 2 +- .../thoughtcrime/securesms/MuteDialog.java | 4 +- .../securesms/PassphrasePromptActivity.java | 6 +- .../PassphraseRequiredActionBarActivity.java | 8 +- .../PlayServicesProblemActivity.java | 2 +- .../PlayServicesProblemFragment.java | 9 +- .../securesms/ReadReceiptsIntroFragment.java | 6 +- .../RecipientPreferenceActivity.java | 26 ++-- .../securesms/RegistrationActivity.java | 6 +- .../thoughtcrime/securesms/ShareActivity.java | 10 +- .../securesms/ShortcutLauncherActivity.java | 8 +- .../securesms/SmsSendtoActivity.java | 2 +- .../securesms/TransportOption.java | 4 +- .../securesms/TransportOptions.java | 4 +- .../securesms/TransportOptionsAdapter.java | 2 +- .../securesms/TransportOptionsPopup.java | 4 +- .../TypingIndicatorIntroFragment.java | 4 +- .../securesms/VerifyIdentityActivity.java | 12 +- .../securesms/WebRtcCallActivity.java | 7 +- .../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 | 5 +- .../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 | 7 +- .../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 | 16 +- .../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 +- .../components/OutlinedThumbnailView.java | 33 +--- .../securesms/components/Outliner.java | 10 +- .../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 | 10 +- .../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 | 5 +- .../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 | 15 +- .../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 | 13 +- .../webrtc/WebRtcAnswerDeclineButton.java | 4 +- .../components/webrtc/WebRtcCallControls.java | 3 +- .../components/webrtc/WebRtcCallScreen.java | 9 +- .../contacts/ContactSelectionListAdapter.java | 10 +- .../contacts/ContactSelectionListItem.java | 2 +- .../contacts/ContactsCursorLoader.java | 4 +- .../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 | 5 +- .../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 | 5 +- .../contactshare/ContactNameEditActivity.java | 6 +- .../ContactNameEditViewModel.java | 11 +- .../contactshare/ContactRepository.java | 6 +- .../ContactShareEditActivity.java | 12 +- .../contactshare/ContactShareEditAdapter.java | 11 +- .../ContactShareEditViewModel.java | 10 +- .../securesms/contactshare/ContactUtil.java | 10 +- .../SharedContactDetailsActivity.java | 10 +- .../conversation/ConversationActivity.java | 22 +-- .../conversation/ConversationAdapter.java | 10 +- .../conversation/ConversationFragment.java | 26 ++-- .../conversation/ConversationItem.java | 9 +- .../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 | 2 +- .../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 | 5 +- .../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 | 5 +- .../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 | 2 +- .../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/gcm/FcmService.java | 2 +- .../thoughtcrime/securesms/gcm/FcmUtil.java | 2 +- .../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 | 4 +- .../securesms/jobs/AttachmentUploadJob.java | 2 +- .../securesms/jobs/AvatarDownloadJob.java | 2 +- .../thoughtcrime/securesms/jobs/BaseJob.java | 2 +- .../securesms/jobs/CleanPreKeysJob.java | 2 +- .../securesms/jobs/CreateSignedPreKeyJob.java | 2 +- .../securesms/jobs/DirectoryRefreshJob.java | 4 +- .../securesms/jobs/FastJobStorage.java | 4 +- .../securesms/jobs/FcmRefreshJob.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 | 2 +- .../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 | 8 +- .../securesms/jobs/PushGroupUpdateJob.java | 2 +- .../securesms/jobs/PushMediaSendJob.java | 4 +- .../jobs/PushNotificationReceiveJob.java | 2 +- .../securesms/jobs/PushReceivedJob.java | 2 +- .../securesms/jobs/PushSendJob.java | 4 +- .../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 | 4 +- .../securesms/jobs/SmsSendJob.java | 2 +- .../securesms/jobs/SmsSentJob.java | 2 +- .../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 +- .../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 | 17 +- .../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/MarkReadReceiver.java | 4 +- .../notifications/MessageNotifier.java | 6 +- .../MultipleRecipientNotificationBuilder.java | 6 +- .../notifications/NotificationChannels.java | 6 +- .../notifications/NotificationItem.java | 6 +- .../notifications/NotificationState.java | 4 +- .../PendingMessageNotificationBuilder.java | 2 +- .../notifications/RemoteReplyReceiver.java | 2 +- .../securesms/notifications/ReplyMethod.java | 2 +- .../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 | 12 +- .../CorrectedPreferenceFragment.java | 18 +-- .../ListSummaryPreferenceFragment.java | 4 +- .../preferences/MmsPreferencesActivity.java | 6 +- .../preferences/MmsPreferencesFragment.java | 2 +- .../NotificationsPreferenceFragment.java | 6 +- .../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 | 5 +- .../recipients/RecipientProvider.java | 4 +- .../registration/CaptchaActivity.java | 17 +- .../registration/WelcomeActivity.java | 3 +- .../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 | 3 +- .../securesms/search/SearchViewModel.java | 14 +- .../securesms/search/model/MessageResult.java | 2 +- .../securesms/search/model/SearchResult.java | 4 +- .../service/ApplicationMigrationService.java | 2 +- .../service/ContactsSyncAdapterService.java | 2 +- .../securesms/service/DirectShareService.java | 4 +- .../service/GenericForegroundService.java | 10 +- .../service/IncomingMessageObserver.java | 14 +- .../securesms/service/KeyCachingService.java | 9 +- .../service/UpdateApkReadyListener.java | 6 +- .../securesms/service/WebRtcCallService.java | 6 +- .../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 | 4 +- .../thoughtcrime/securesms/util/Dialogs.java | 2 +- .../securesms/util/DirectoryHelper.java | 4 +- .../securesms/util/FileProviderUtil.java | 4 +- .../securesms/util/GroupUtil.java | 7 +- .../securesms/util/IdentityUtil.java | 6 +- .../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 | 12 +- .../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 | 6 +- .../securesms/util/TelephonyUtil.java | 2 +- .../securesms/util/TextSecurePreferences.java | 8 +- .../securesms/util/ThemeUtil.java | 9 +- src/org/thoughtcrime/securesms/util/Util.java | 6 +- .../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 | 10 +- .../exo/AttachmentDataSourceFactory.java | 4 +- .../securesms/video/exo/PartDataSource.java | 4 +- .../webrtc/CallNotificationBuilder.java | 11 +- .../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 +- 722 files changed, 1728 insertions(+), 1876 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b284098f43..b70c498adf 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -580,7 +580,7 @@ android:exported="false" android:authorities="org.thoughtcrime.provider.securesms.mms" /> - diff --git a/build.gradle b/build.gradle index b5065f50fa..b9ace224f3 100644 --- a/build.gradle +++ b/build.gradle @@ -54,21 +54,19 @@ repositories { } 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.2' + 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.1' + implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' + implementation 'androidx.lifecycle:lifecycle-common-java8:2.0.0' implementation('com.google.firebase:firebase-messaging:17.3.4') { exclude group: 'com.google.firebase', module: 'firebase-core' @@ -95,8 +93,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' + implementation 'com.github.bumptech.glide:glide:4.9.0' + annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0' + annotationProcessor 'androidx.annotation:annotation:1.1.0' implementation 'com.makeramen:roundedimageview:2.1.0' implementation 'com.pnikosis:materialish-progress:1.5' implementation 'org.greenrobot:eventbus:3.0.0' @@ -144,9 +143,9 @@ 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 'com.android.support:multidex:1.0.3' - androidTestImplementation 'com.android.support:multidex-instrumentation:1.0.3' + testImplementation 'androidx.test:core:1.2.0' + 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' androidTestImplementation ('org.assertj:assertj-core:1.7.1') { @@ -163,25 +162,28 @@ dependencies { dependencyVerification { configuration = '(play|website)(Debug|Release)RuntimeClasspath' verify = [ - 'com.android.support:design:7874ad1904eedc74aa41cffffb7f759d8990056f3bbbc9264911651c67c42f5f', - 'com.android.support:preference-v14:8133c6e19233fa51e036a341e6d3f4adeead3375cebf777efced0fe154c3267e', - 'com.android.support:preference-v7:75eabe936d1fc3b178450a554c4d433466036f2be6d6dccdf971eac9590fdbf5', + 'com.google.android.material:material:7680e381a3c03798d999b2e441caadd8a56a0a808e108024a67af9fe26c11adc', + 'androidx.legacy:legacy-preference-v14:d6d11913e56b8f2d14fd560bd1ad6d7fd5624a15dd4ec073b2d9188205f86280', + 'androidx.preference:preference:ea9fde25606eb456210ffe9f7e51048abd776b55a34c0cc6608282b5699122d1', 'com.pnikosis:materialish-progress:d71d80e00717a096784482aee21001a9d299fec3833e4ebd87739ed36cf77c54', 'pl.tajchert:waitingdots:2835d49e0787dbcb606c5a60021ced66578503b1e9fddcd7a5ef0cd5f095ba2c', 'com.theartofdev.edmodo:android-image-cropper:72a1b03c5642fe8489061c732e43b10558c850129b576970e4f77a5d4c25317a', 'mobi.upod:time-duration-picker:db469ce0f48dd96b892eac424ed76870e54bf00fe0a28cdcddfbe5f2a226a0e1', + 'cn.carbswang.android:NumberPickerView:18b3c316d62c7c277978a8d4ed57a5b8f4e943762264960f579a8a549c756729', + 'com.tomergoldst.android:tooltips:4c56697dd1ad64b8066535c61f961a6d901e7ae5d97ae27084ba40ad620349b6', + 'com.takisoft.fix:colorpicker:f5d0dbabe406a1800498ca9c1faf34db36e021d8488bf10360f29961fe3ab0d1', 'com.codewaves.stickyheadergrid:stickyheadergrid:5b4aa6a52a957cfd55f60f4220c11c0c371385a3cb9786cae03c260dcdef5794', - 'com.android.support:appcompat-v7:a3a8e5230359746ed91801579b5fbe4668e3b1c4e6a14c7d67c8f58cb0311752', + 'androidx.appcompat:appcompat:a3080cdd5e5c56cb72f9d428b1657d4380011ec211cfedf76e084b95f6bf0d03', 'com.melnykov:floatingactionbutton:15d58d4fac0f7a288d0e5301bbaf501a146f5b3f5921277811bf99bd3b397263', - 'com.android.support:recyclerview-v7:eb296414c1f6d4c7b522f69fe50588ea85297855db0e7806c24eb4f75409587d', - 'com.android.support:support-v13:491f940c5d6d2ec7678fa2f14bd4bbbe8bf776e2c776d04bf0e5c2175975be43', - 'com.android.support:cardview-v7:bc9e6b0e06ce1205f1db34f0e6193019613d19cfeb54cdccea722340d1c60f26', - 'com.android.support:gridlayout-v7:5029529f7db66f8773426bf7318645f0840fc50d74f66355cd60c5e58d2da087', - 'com.android.support:exifinterface:bbf44e519edd6333a24a3285aa21fd00181b920b81ca8aa89a8899f03ab4d6b0', - 'com.android.support.constraint:constraint-layout:27b4e5c0b80d3ff8b92f4c93b3b4d3ecf16c01589f4cdf70ca7cf64cb42d8122', - 'com.android.support:multidex:ecf6098572e23b5155bab3b9a82b2fd1530eda6c6c157745e0f5287c66eec60c', - 'android.arch.lifecycle:extensions:429426b2feec2245ffc5e75b3b5309bedb36159cf06dc71843ae43526ac289b6', - 'android.arch.lifecycle:common-java8:7078b5c8ccb94203df9cc2a463c69cf0021596e6cf966d78fbfd697aaafe0630', + 'androidx.recyclerview:recyclerview:06956fb1ac014027ca9d2b40469a4b42aa61b4957bb11848e1ff352701ab4548', + 'androidx.legacy:legacy-support-v13:65f5fcb57644d381d471a00fdf50f90b808be6b48a8ae57fb4ea39b7da8cca86', + 'androidx.cardview:cardview:1193c04c22a3d6b5946dae9f4e8c59d6adde6a71b6bd5d87fb99d82dda1afec7', + 'androidx.gridlayout:gridlayout:a7e5dc6f39dbc3dc6ac6d57b02a9c6fd792e80f0e45ddb3bb08e8f03d23c8755', + 'androidx.exifinterface:exifinterface:ee48be10aab8f54efff4c14b77d11e10b9eeee4379d5ef6bf297a2923c55cc11', + 'androidx.constraintlayout:constraintlayout:5ff864def9d41cd04e08348d69591143bae3ceff4284cf8608bceb98c36ac830', + 'androidx.multidex:multidex:42dd32ff9f97f85771b82a20003a8d70f68ab7b4ba328964312ce0732693db09', + 'androidx.lifecycle:lifecycle-extensions:8d4072201b6231d67e4192d608d46b1f5c920845106c9831632c2e3ffe706117', + 'androidx.lifecycle:lifecycle-common-java8:9edc2d4f589656d470ef03b9c6ece62d335971294b033ec7d9ceb6e361e9aafa', 'com.google.firebase:firebase-messaging:e42288e7950d7d3b033d3395a5ac9365d230da3e439a2794ec13e2ef0fbaf078', 'com.google.android.gms:play-services-places:2d5c4e4ac3ee5be21b4ec544411bc51d11457b5ae2fa2a5d4539019f87c233c6', 'com.google.android.gms:play-services-maps:07f59c5955b759ce7b80ceaeb8261643c5b79acc9f180df2b7c3987658eed2e8', @@ -197,7 +199,7 @@ dependencyVerification { 'com.jpardogo.materialtabstrip:library:c6ef812fba4f74be7dc4a905faa4c2908cba261a94c13d4f96d5e67e4aad4aaa', 'org.apache.httpcomponents:httpclient-android:6f56466a9bd0d42934b90bfbfe9977a8b654c058bf44a12bdc2877c4e1f033f1', 'com.github.chrisbanes:PhotoView:ed06775308da260e1fd86d1d3288988fcd3d80db24ce0d7c9fcfedc39e622292', - 'com.github.bumptech.glide:glide:997de7ac95be6c944d3b8cbe13de11307736ea45451c1b09a6cec7c328ead59f', + 'com.github.bumptech.glide:glide:1bf482442fce81aa9065a5e97e721039d921cc45f727a987be5f1a69f844d955', 'com.makeramen:roundedimageview:1f5a1865796b308c6cdd114acc6e78408b110f0a62fc63553278fbeacd489cd1', 'org.greenrobot:eventbus:180d4212467df06f2fbc9c8d8a2984533ac79c87769ad883bc421612f0b4e17c', 'com.google.zxing:android-integration:89e56aadf1164bd71e57949163c53abf90af368b51669c0d4a47a163335f95c4', @@ -205,11 +207,8 @@ dependencyVerification { 'com.amulyakhare:com.amulyakhare.textdrawable:54c92b5fba38cfd316a07e5a30528068f45ce8515a6890f1297df4c401af5dcb', 'com.google.zxing:core:b4d82452e7a6bf6ec2698904b332431717ed8f9a850224f295aec89de80f2259', 'com.davemorrissey.labs:subsampling-scale-image-view:550c5baa07e0bb4ff0a18b705e96d34436d22619248bd8c08c08c730b1f55cfe', - 'cn.carbswang.android:NumberPickerView:18b3c316d62c7c277978a8d4ed57a5b8f4e943762264960f579a8a549c756729', - 'com.tomergoldst.android:tooltips:4c56697dd1ad64b8066535c61f961a6d901e7ae5d97ae27084ba40ad620349b6', 'com.klinkerapps:android-smsmms:e7c3328a0f3a8dd44daa8129de4e99996f3057a4546e47891b036b81e0ebf1d1', 'com.annimon:stream:5da6e2e3e0551d61a3ea7014f04312276549e3dd739cf637996e4cf43c5535b9', - 'com.takisoft.fix:colorpicker:f5d0dbabe406a1800498ca9c1faf34db36e021d8488bf10360f29961fe3ab0d1', 'com.github.dmytrodanylyk.circular-progress-button:library:8dc6a29a5a8db7b2ad5a9a7fda1dc9ae0893f4c8f0545732b2c63854ea693e8e', 'org.signal:android-database-sqlcipher:33d4063336893af00b9d68b418e7b290cace74c20ce8aacffddc0911010d3d73', 'com.googlecode.ez-vcard:ez-vcard:7e24ad50b222d2f70ac91bdccfa3c0f6200b078d797cb784837f75e77bb4210f', @@ -223,44 +222,46 @@ dependencyVerification { 'com.google.android.gms:play-services-places-placereport:04f8baeb1f8f8a734c7d4b1701a3974281b45591affa7e963b59dd019b8abc6e', 'com.google.android.gms:play-services-stats:5b2d8281adbfd6e74d2295c94bab9ea80fc9a84dfbb397995673f5af4d4c6368', 'com.google.android.gms:play-services-basement:e08bfd1e87c4e50ef76161d7ac76b873aeb975367eeb3afa4abe62ea1887c7c6', - 'com.android.support:support-v4:8b9031381c678d628c9e47b566ae1d161e1c9710f7855c759beeac7596cecf30', - 'com.android.support:support-fragment:3772fc738ada86824ba1a4b3f197c3dbd67b7ddcfe2c9db1de95ef2e3487a915', - 'com.android.support:animated-vector-drawable:271ecbc906cda8dcd9e655ba0473129c3408a4189c806f616c378e6fd18fb3b7', - 'com.android.support:support-core-ui:bbc7f65fc95649464733af373361532ab5f9f3b749c3badaa2bbf27e574b6c6f', - 'com.android.support:support-core-utils:c81e1e98ca3cb2edae002c69cf35b22aec364b8cb2f1042c97e206eb5790ac41', - 'com.android.support:support-vector-drawable:f658986d968172bccfed28578471c96050780fe5e133861e4d331069cc373f4d', - 'com.android.support:transition:45d09fc51284c17bbab300f5122512ac7d7348a6d23bda2051648bbe76cc9aa5', - 'com.android.support:loader:920b85efd72dc33e915b0f88a883fe73b88483c6df8751a741e17611f2460341', - 'com.android.support:viewpager:013c4c53058758ec104dbae970be58159f75dfe342ba8b937d15ff5282e35ffc', - 'com.android.support:coordinatorlayout:9dfacd80423dc979048fbaed83c0ee543c46259feb2417377e79a656888d3892', - 'com.android.support:drawerlayout:8f6809afae4793550c37461c9810e954ae6a23dbb4d23e5333bf18148df1150a', - 'com.android.support:slidingpanelayout:d1d234f66a1b36a9aee9b94fa6c66f97128c0828078c8e889e9037ec898cd600', - 'com.android.support:customview:98db03845f994e08248bf701c1ff0ccaa12e70f94251ec9272900f0f694e072b', - 'com.android.support:swiperefreshlayout:a3b41f7f6730866b49865e86e49f988d4858699765f534300fb2ff5f9325e712', - 'com.android.support:asynclayoutinflater:115bde87721f7334579b0c735f60dd7c98af1bb7f34010c5b0553b95dc351aa2', - 'com.android.support:support-media-compat:266eff9605f515013eee1ebdbd8818a9270696dc807f34bbcc5fc11fb61a22c7', - 'com.android.support:support-compat:e17e3b01dbea3f9ea1c86943292f903ca93d2231c6242e456e0b6a9c5817118a', - 'com.android.support:versionedparcelable:60eb1cb08f71b65c3f6123135e03ebeb5930b5e126e1e5b2ac91b386908c9d02', - 'com.android.support:collections:93c258c8a09f531a267653829742c0f8f6da0e348b11cb8655b0855628f2d4f0', - 'com.android.support:cursoradapter:87feffe742b8d62ca8a9833abe564838bf6a672e31c7ad1306ec4006adf90d21', - 'android.arch.lifecycle:runtime:c4e4be66c1b2f0abec593571454e1de14013f7e0f96bf2a9f212931a48cae550', - 'android.arch.lifecycle:livedata:50ab0490c1ff1a7cfb4e554032998b080888946d0dd424f39900efc4a1bcd750', - 'android.arch.lifecycle:livedata-core:d6fdd8b985d6178d7ea2f16986a24e83f1bee936b74d43167c69e08d3cc12c50', - 'android.arch.core:runtime:c3215aa5873311b3f88a6f4e4a3c25ad89971bc127de8c3e1291c57f93a05c39', - 'android.arch.core:common:3a616a32f433e9e23f556b38575c31b013613d3ae85206263b7625fe1f4c151a', - 'android.arch.lifecycle:common:8d378e88ebd5189e09eef623414812c868fd90aa519d6160e2311fb8b81cff56', - 'android.arch.lifecycle:viewmodel:7de29cfaba77d6b5d5be234c57f6812d0150d087e63941af22ba1d1f8e2bc96a', - 'com.github.bumptech.glide:gifdecoder:59ccf3bb0cec11dab4b857382cbe0b171111b6fc62bf141adce4e1180889af15', - 'com.android.support:documentfile:47cdcd3e9302b7b064923f05487a5c03babbd9bbda4726b71e97791fab5d4779', - 'com.android.support:localbroadcastmanager:d287c823af5fdde72c099fcfc5f630efe9687af7a914343ae6fd92de32c8a806', - 'com.android.support:print:4be8a812d73e4a80e35b91ceae127def3f0bb9726bf3bc439aa0cc81503f5728', - 'com.android.support:interpolator:7bc7ee86a0db39a4b51956f3e89842d2bd962118d57d779eb6ed6b34ba0677ea', - 'com.android.support:support-annotations:5d5b9414f02d3fa0ee7526b8d5ddae0da67c8ecc8c4d63ffa6cf91488a93b927', - 'com.android.support.constraint:constraint-layout-solver:2cafbe356f71c208013d021f32943904798cd6459e5107f9fe27000eb5bc2aef', + 'androidx.legacy:legacy-support-v4:78fec1485f0f388a4749022dd51416857127cd2544ae1c3fd0b16589055480b0', + 'androidx.fragment:fragment:65dd32d71fe65a32e77989a6cfb1ad09307038927f82a740c7611162d0b518f8', + 'androidx.vectordrawable:vectordrawable-animated:26c3a0cf0a9a9a7d235a0b00f2f37e431d52d9952751e3eb7c90b4b52c236cf1', + 'androidx.legacy:legacy-support-core-ui:0d1260c6e7e6a337f875df71b516931e703f716e90889817cd3a20fa5ac3d947', + 'androidx.legacy:legacy-support-core-utils:a7edcf01d5b52b3034073027bc4775b78a4764bb6202bb91d61c829add8dd1c7', + 'androidx.vectordrawable:vectordrawable:4ca358957b9510e52fc388e01c9d33c2d655d406bfe6e71984e9afea9f715ed2', + 'androidx.transition:transition:a00a0f763f401abcecda9b0eafcb738929c5801b111a9a414b81a193d0f4008d', + 'androidx.media:media:b23b527b2bac870c4a7451e6982d7132e413e88d7f27dbeb1fc7640a720cd9ee', + 'androidx.loader:loader:11f735cb3b55c458d470bed9e25254375b518b4b1bad6926783a7026db0f5025', + 'androidx.viewpager:viewpager:147af4e14a1984010d8f155e5e19d781f03c1d70dfed02a8e0d18428b8fc8682', + 'androidx.coordinatorlayout:coordinatorlayout:e508c695489493374d942bf7b4ee02abf7571d25aac4c622e57d6cd5cd29eb73', + 'androidx.drawerlayout:drawerlayout:9402442cdc5a43cf62fb14f8cf98c63342d4d9d9b805c8033c6cf7e802749ac1', + 'androidx.slidingpanelayout:slidingpanelayout:76bffb7cefbf780794d8817002dad1562f3e27c0a9f746d62401c8edb30aeede', + 'androidx.customview:customview:20e5b8f6526a34595a604f56718da81167c0b40a7a94a57daa355663f2594df2', + 'androidx.swiperefreshlayout:swiperefreshlayout:9761b3a809c9b093fd06a3c4bbc645756dec0e95b5c9da419bc9f2a3f3026e8d', + 'androidx.asynclayoutinflater:asynclayoutinflater:f7eab60c57addd94bb06275832fe7600611beaaae1a1ec597c231956faf96c8b', + 'androidx.core:core:b1a90522c22cad8c5fb7a4f912493dbcde463c6a37b4148dfb9423763460f998', + 'androidx.versionedparcelable:versionedparcelable:f6438a93ed8016ccddca0e140a70be0b0110e0424edaa1472f84f98fed2e1ce3', + 'androidx.collection:collection:9c8d117b5c2bc120a1cdfeb857e05b495b16c36013570372a708f7827e3ac9f9', + 'androidx.cursoradapter:cursoradapter:a81c8fe78815fa47df5b749deb52727ad11f9397da58b16017f4eb2c11e28564', + 'androidx.lifecycle:lifecycle-process:d8ff6fd844559743050c9ae010a6df230f2a3dbdf3e14498316f30bd8df836b5', + 'androidx.lifecycle:lifecycle-service:cb2b15bb0cf14134e953ed8ead96f94265018643f519367d51fd837f7311e9f8', + 'androidx.lifecycle:lifecycle-runtime:e4afc9e636183f6f3e0edf1cf46121a492ffd2c673075bb07f55c7a99dd43cfb', + 'androidx.lifecycle:lifecycle-livedata:c82609ced8c498f0a701a30fb6771bb7480860daee84d82e0a81ee86edf7ba39', + 'androidx.lifecycle:lifecycle-livedata-core:fde334ec7e22744c0f5bfe7caf1a84c9d717327044400577bdf9bd921ec4f7bc', + 'androidx.arch.core:core-runtime:87e65fc767c712b437649c7cee2431ebb4bed6daef82e501d4125b3ed3f65f8e', + 'androidx.arch.core:core-common:4b80b337779b526e64b0ee0ca9e0df43b808344d145f8e9b1c42a134dac57ad8', + 'androidx.lifecycle:lifecycle-common:7bad7a188804adea6fa1f35d5ef99b705f20bd93ecadde484760ff86b535fefc', + 'androidx.lifecycle:lifecycle-viewmodel:d6460aea1b6bad80ab14cf88297e9e43bfde8d87c3e5c28f2c508233ffbcc062', + 'com.github.bumptech.glide:gifdecoder:7ee9402ae1c48fac9232b67e81f881c217b907b3252e49ce57bdb97937ebb270', + 'androidx.documentfile:documentfile:865a061ef2fad16522f8433536b8d47208c46ff7c7745197dfa1eeb481869487', + 'androidx.localbroadcastmanager:localbroadcastmanager:e71c328ceef5c4a7d76f2d86df1b65d65fe2acf868b1a4efd84a3f34336186d8', + 'androidx.print:print:1d5c7f3135a1bba661fc373fd72e11eb0a4adbb3396787826dd8e4190d5d9edd', + 'androidx.interpolator:interpolator:33193135a64fe21fa2c35eec6688f1a76e512606c0fc83dc1b689e37add7732a', + 'androidx.annotation:annotation:0baae9755f7caf52aa80cd04324b91ba93af55d4d1d17dcc9a7b53d99ef7c016', + 'androidx.constraintlayout:constraintlayout-solver:965c177e64fbd81bd1d27b402b66ef9d7bc7b5cb5f718044bf7a453abc542045', 'org.signal:signal-metadata-android:02323bc29317fa9d3b62fab0b507c94ba2e9bcc4a78d588888ffd313853757b3', 'org.whispersystems:signal-service-java:440777f4beca894f37b86258f1493fd5c2e87df02fb9a6331f0c82b842c91012', - 'com.github.bumptech.glide:disklrucache:c1b1b6f5bbd01e2fcdc9d7f60913c8d338bdb65ed4a93bfa02b56f19daaade4b', - 'com.github.bumptech.glide:annotations:bede99ef9f71517a4274bac18fd3e483e9f2b6108d7d6fe8f4949be4aa4d9512', + 'com.github.bumptech.glide:disklrucache:4696a81340eb6beee21ab93f703ed6e7ae49fb4ce3bc2fbc546e5bacd21b96b9', + 'com.github.bumptech.glide:annotations:702a7521cb3f6d7e55edd66e90bda1a1975baf971d25f75b75638579f86bc69b', 'com.nineoldandroids:library:68025a14e3e7673d6ad2f95e4b46d78d7d068343aa99256b686fe59de1b3163a', 'javax.inject:javax.inject:91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff', 'com.klinkerapps:logger:177e325259a8b111ad6745ec10db5861723c99f402222b80629f576f49408541', diff --git a/gradle.properties b/gradle.properties index ceddf08f8e..54f0776451 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,3 @@ -org.gradle.jvmargs=-Xmx2048m \ No newline at end of file +org.gradle.jvmargs=-Xmx2048m +android.useAndroidX=true +android.enableJetifier=true \ 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"> - - - - - - @@ -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_search_nav.xml b/res/layout/conversation_search_nav.xml index 529a3be282..e3d97456d7 100644 --- a/res/layout/conversation_search_nav.xml +++ b/res/layout/conversation_search_nav.xml @@ -9,7 +9,7 @@ android:background="?conversation_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,22 +24,22 @@ 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 fa63b8c252..4aa2af8aee 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 2a24f4e760..dfb82fb86f 100644 --- a/res/layout/media_overview_activity.xml +++ b/res/layout/media_overview_activity.xml @@ -1,16 +1,16 @@ - - - - + - + diff --git a/res/layout/media_overview_documents_fragment.xml b/res/layout/media_overview_documents_fragment.xml index c3edce10c9..b109d705ba 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="?attr/media_overview_toolbar_background"> - - - - - - - - - @@ -134,7 +134,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 addb8f5fd0..3f95d6fa6d 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 9cfc92a0ad..55078f5683 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 ad54667649..5ff463054e 100644 --- a/res/menu/conversation.xml +++ b/res/menu/conversation.xml @@ -11,7 +11,7 @@ \ No newline at end of file diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java index 70e1138150..143d05571d 100644 --- a/src/org/thoughtcrime/securesms/ApplicationContext.java +++ b/src/org/thoughtcrime/securesms/ApplicationContext.java @@ -17,14 +17,14 @@ package org.thoughtcrime.securesms; import android.annotation.SuppressLint; -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.os.AsyncTask; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.multidex.MultiDexApplication; +import androidx.annotation.NonNull; +import androidx.multidex.MultiDexApplication; import com.google.android.gms.security.ProviderInstaller; diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java index 77cc32e981..fc37ef40a4 100644 --- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java +++ b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java @@ -26,13 +26,13 @@ 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.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.preference.Preference; import org.thoughtcrime.securesms.preferences.AdvancedPreferenceFragment; import org.thoughtcrime.securesms.preferences.AppProtectionPreferenceFragment; diff --git a/src/org/thoughtcrime/securesms/BaseActionBarActivity.java b/src/org/thoughtcrime/securesms/BaseActionBarActivity.java index 75d24ef5f2..3f35d97de8 100644 --- a/src/org/thoughtcrime/securesms/BaseActionBarActivity.java +++ b/src/org/thoughtcrime/securesms/BaseActionBarActivity.java @@ -6,10 +6,10 @@ import android.content.Intent; 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.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.core.app.ActivityCompat; +import androidx.core.app.ActivityOptionsCompat; +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 e1f03b1a68..8cb04c572a 100644 --- a/src/org/thoughtcrime/securesms/BaseActivity.java +++ b/src/org/thoughtcrime/securesms/BaseActivity.java @@ -4,8 +4,8 @@ import android.content.Context; 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 9d50273fc3..0b74b992ee 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 2dc23d6107..2392d685f7 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 4400b2997d..b62ffa2a21 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; public class ClearProfileAvatarActivity extends Activity { diff --git a/src/org/thoughtcrime/securesms/ConfirmIdentityDialog.java b/src/org/thoughtcrime/securesms/ConfirmIdentityDialog.java index 1615dee48d..8652d27d6c 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 3fb1ebc505..cb713d4632 100644 --- a/src/org/thoughtcrime/securesms/ContactSelectionActivity.java +++ b/src/org/thoughtcrime/securesms/ContactSelectionActivity.java @@ -19,7 +19,7 @@ package org.thoughtcrime.securesms; import android.content.Context; import android.os.AsyncTask; import android.os.Bundle; -import android.support.v4.widget.SwipeRefreshLayout; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.components.ContactFilterToolbar; diff --git a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java index d68d7ef1f8..d32ce01ed4 100644 --- a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java +++ b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java @@ -21,15 +21,14 @@ import android.Manifest; import android.annotation.SuppressLint; import android.database.Cursor; import android.os.AsyncTask; -import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v4.app.LoaderManager; -import android.support.v4.content.Loader; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java index 8eef67498d..0efe2a6c3a 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.text.TextUtils; import android.view.Menu; import android.view.MenuInflater; diff --git a/src/org/thoughtcrime/securesms/ConversationListAdapter.java b/src/org/thoughtcrime/securesms/ConversationListAdapter.java index 399272d457..4539030378 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 216854bb9f..6853ebfb01 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; diff --git a/src/org/thoughtcrime/securesms/ConversationListItem.java b/src/org/thoughtcrime/securesms/ConversationListItem.java index 067b3efbfb..fd69ac0726 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 993a486c3f..c30e429bec 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/CountrySelectionActivity.java b/src/org/thoughtcrime/securesms/CountrySelectionActivity.java index 52ce47c46f..3744ee6857 100644 --- a/src/org/thoughtcrime/securesms/CountrySelectionActivity.java +++ b/src/org/thoughtcrime/securesms/CountrySelectionActivity.java @@ -3,7 +3,6 @@ package org.thoughtcrime.securesms; import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.FragmentActivity; public class CountrySelectionActivity extends BaseActivity implements CountrySelectionFragment.CountrySelectedListener diff --git a/src/org/thoughtcrime/securesms/CountrySelectionFragment.java b/src/org/thoughtcrime/securesms/CountrySelectionFragment.java index 3f53b40ed8..13551128b7 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 5dfd8a2a04..896e749573 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 0ebccceea1..a82ef49723 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; diff --git a/src/org/thoughtcrime/securesms/DeviceActivity.java b/src/org/thoughtcrime/securesms/DeviceActivity.java index 479fb8e05d..6e28909242 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; diff --git a/src/org/thoughtcrime/securesms/DeviceAddFragment.java b/src/org/thoughtcrime/securesms/DeviceAddFragment.java index e0116f52eb..fb4395c12b 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 a8e5493edb..859d05014c 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 ca847a9846..7e4eef086d 100644 --- a/src/org/thoughtcrime/securesms/DeviceListFragment.java +++ b/src/org/thoughtcrime/securesms/DeviceListFragment.java @@ -5,11 +5,11 @@ import android.content.Context; import android.content.DialogInterface; import android.os.AsyncTask; 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 org.thoughtcrime.securesms.devicelist.Device; import org.thoughtcrime.securesms.jobs.RefreshUnidentifiedDeliveryAbilityJob; diff --git a/src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java b/src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java index 0a1ca583f5..d2f7d615b2 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; public class DeviceProvisioningActivity extends PassphraseRequiredActionBarActivity { diff --git a/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java b/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java index 88396673ca..4ebeed2bf7 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 64ac9eb2b4..c1f249ab6f 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 8906185dc5..518288bded 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 org.thoughtcrime.securesms.avatar.AvatarSelection; diff --git a/src/org/thoughtcrime/securesms/GroupMembersDialog.java b/src/org/thoughtcrime/securesms/GroupMembersDialog.java index 997f256dec..b97840f635 100644 --- a/src/org/thoughtcrime/securesms/GroupMembersDialog.java +++ b/src/org/thoughtcrime/securesms/GroupMembersDialog.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; 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 411fbc337f..ad2a476c3f 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 c87fe65e07..d5b8aab83b 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 f36c22b7ee..34a8a7b251 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 org.thoughtcrime.securesms.logging.Log; 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 19096f4447..e67d3b9d96 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 43ee4fe89b..5ed882da56 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 395514f39d..5a6a0c8f3d 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 a23c4cd962..8fcb5d88a1 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 1b48432581..6a08bcbd75 100644 --- a/src/org/thoughtcrime/securesms/MessageDetailsActivity.java +++ b/src/org/thoughtcrime/securesms/MessageDetailsActivity.java @@ -25,10 +25,10 @@ import android.graphics.drawable.ColorDrawable; 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.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 org.thoughtcrime.securesms.conversation.ConversationItem; import org.thoughtcrime.securesms.logging.Log; diff --git a/src/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java b/src/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java index cca89cfecb..004a27367a 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 6568c94e95..d2a1974bcb 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 0d8f4cec8c..543df8e8b0 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 940ea8a9dc..691b4de983 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.logging.Log; import org.thoughtcrime.securesms.crypto.MasterSecretUtil; diff --git a/src/org/thoughtcrime/securesms/PlayServicesProblemActivity.java b/src/org/thoughtcrime/securesms/PlayServicesProblemActivity.java index 216fab99f3..d17fbd8d89 100644 --- a/src/org/thoughtcrime/securesms/PlayServicesProblemActivity.java +++ b/src/org/thoughtcrime/securesms/PlayServicesProblemActivity.java @@ -17,7 +17,7 @@ package org.thoughtcrime.securesms; import android.os.Bundle; -import android.support.v4.app.FragmentActivity; +import androidx.fragment.app.FragmentActivity; public class PlayServicesProblemActivity extends FragmentActivity { diff --git a/src/org/thoughtcrime/securesms/PlayServicesProblemFragment.java b/src/org/thoughtcrime/securesms/PlayServicesProblemFragment.java index 07fb96c76a..079dd6d1d0 100644 --- a/src/org/thoughtcrime/securesms/PlayServicesProblemFragment.java +++ b/src/org/thoughtcrime/securesms/PlayServicesProblemFragment.java @@ -21,13 +21,12 @@ import android.app.Activity; import android.app.Dialog; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; +import androidx.appcompat.app.AlertDialog; import com.google.android.gms.common.GoogleApiAvailability; -import com.google.android.gms.common.GooglePlayServicesUtil; public class PlayServicesProblemFragment extends DialogFragment { diff --git a/src/org/thoughtcrime/securesms/ReadReceiptsIntroFragment.java b/src/org/thoughtcrime/securesms/ReadReceiptsIntroFragment.java index 154f2a452b..b42a64b32b 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 707204e87b..c281661b66 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 org.thoughtcrime.securesms.components.SwitchPreferenceCompat; diff --git a/src/org/thoughtcrime/securesms/RegistrationActivity.java b/src/org/thoughtcrime/securesms/RegistrationActivity.java index 75aa555c78..7472b2f338 100644 --- a/src/org/thoughtcrime/securesms/RegistrationActivity.java +++ b/src/org/thoughtcrime/securesms/RegistrationActivity.java @@ -9,9 +9,9 @@ import android.content.Intent; import android.content.IntentFilter; 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 69b9ac82b5..578ecd4c2e 100644 --- a/src/org/thoughtcrime/securesms/ShareActivity.java +++ b/src/org/thoughtcrime/securesms/ShareActivity.java @@ -27,11 +27,11 @@ 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.v4.widget.SwipeRefreshLayout; -import android.support.v7.app.ActionBar; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.appcompat.app.ActionBar; +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 71e5479ed5..a35df58126 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 428ec78fad..c6602cce3f 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 org.thoughtcrime.securesms.conversation.ConversationActivity; diff --git a/src/org/thoughtcrime/securesms/TransportOption.java b/src/org/thoughtcrime/securesms/TransportOption.java index 999808becb..effda406a6 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 e835f4604b..4e5cb91d34 100644 --- a/src/org/thoughtcrime/securesms/TransportOptions.java +++ b/src/org/thoughtcrime/securesms/TransportOptions.java @@ -2,8 +2,8 @@ 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; diff --git a/src/org/thoughtcrime/securesms/TransportOptionsAdapter.java b/src/org/thoughtcrime/securesms/TransportOptionsAdapter.java index e301eb804f..0e460d13fd 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 c0c7adbb68..879056243f 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 f52b75f5e6..e941183a55 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 ccee12342f..66e36e97a0 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 1058349028..2ec5f69aaa 100644 --- a/src/org/thoughtcrime/securesms/WebRtcCallActivity.java +++ b/src/org/thoughtcrime/securesms/WebRtcCallActivity.java @@ -24,10 +24,9 @@ import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.content.res.Configuration; import android.media.AudioManager; -import android.os.Build; 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 org.thoughtcrime.securesms.logging.Log; import android.view.View; import android.view.Window; @@ -42,12 +41,10 @@ import org.thoughtcrime.securesms.components.webrtc.WebRtcCallScreen; import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore; import org.thoughtcrime.securesms.events.WebRtcViewModel; import org.thoughtcrime.securesms.permissions.Permissions; -import org.thoughtcrime.securesms.push.SignalServiceNetworkAccess; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.service.WebRtcCallService; import org.thoughtcrime.securesms.util.ServiceUtil; import org.thoughtcrime.securesms.util.TextSecurePreferences; -import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.ViewUtil; import org.whispersystems.libsignal.IdentityKey; import org.whispersystems.libsignal.SignalProtocolAddress; diff --git a/src/org/thoughtcrime/securesms/attachments/Attachment.java b/src/org/thoughtcrime/securesms/attachments/Attachment.java index 760ef65e33..f8ba34bda5 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 bcb4f7b056..a5d588fc04 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 1826b7f214..5b22dccad1 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 b862142bbf..aa12778c45 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 f7c5f21808..1ab5b0a6c4 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 9f939feafc..d72fa56aa5 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; @@ -21,7 +21,6 @@ import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.DefaultLoadControl; import com.google.android.exoplayer2.DefaultRenderersFactory; import com.google.android.exoplayer2.ExoPlaybackException; -import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayerFactory; import com.google.android.exoplayer2.LoadControl; import com.google.android.exoplayer2.Player; diff --git a/src/org/thoughtcrime/securesms/avatar/AvatarSelection.java b/src/org/thoughtcrime/securesms/avatar/AvatarSelection.java index a0bb533d9e..6dfdb354dd 100644 --- a/src/org/thoughtcrime/securesms/avatar/AvatarSelection.java +++ b/src/org/thoughtcrime/securesms/avatar/AvatarSelection.java @@ -6,9 +6,9 @@ import android.content.Context; import android.content.Intent; import android.net.Uri; 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 14b065ad4a..bfe089c5ff 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 9fd860c037..01aeb29fa2 100644 --- a/src/org/thoughtcrime/securesms/backup/FullBackupImporter.java +++ b/src/org/thoughtcrime/securesms/backup/FullBackupImporter.java @@ -6,13 +6,12 @@ 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; import org.greenrobot.eventbus.EventBus; -import org.thoughtcrime.securesms.attachments.AttachmentId; import org.thoughtcrime.securesms.backup.BackupProtos.Attachment; import org.thoughtcrime.securesms.backup.BackupProtos.BackupFrame; import org.thoughtcrime.securesms.backup.BackupProtos.DatabaseVersion; @@ -23,12 +22,8 @@ import org.thoughtcrime.securesms.crypto.AttachmentSecret; import org.thoughtcrime.securesms.crypto.ModernEncryptingPartOutputStream; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.AttachmentDatabase; -import org.thoughtcrime.securesms.database.DatabaseFactory; -import org.thoughtcrime.securesms.database.GroupReceiptDatabase; -import org.thoughtcrime.securesms.database.MmsDatabase; import org.thoughtcrime.securesms.database.SearchDatabase; import org.thoughtcrime.securesms.database.StickerDatabase; -import org.thoughtcrime.securesms.database.ThreadDatabase; import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.profiles.AvatarHelper; import org.thoughtcrime.securesms.util.Conversions; diff --git a/src/org/thoughtcrime/securesms/color/MaterialColor.java b/src/org/thoughtcrime/securesms/color/MaterialColor.java index a613ba5041..20b87d29ab 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 org.thoughtcrime.securesms.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 293be81534..8d3edcabf3 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 64da435653..8ae66c30cc 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 2e0b7dfb45..f2b6a3f76e 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 f81e09386f..cc75059fb2 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 a90b1bb814..d5ea649223 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 d781095a35..f12165648a 100644 --- a/src/org/thoughtcrime/securesms/components/AvatarImageView.java +++ b/src/org/thoughtcrime/securesms/components/AvatarImageView.java @@ -6,9 +6,9 @@ import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Paint; 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 com.bumptech.glide.load.engine.DiskCacheStrategy; diff --git a/src/org/thoughtcrime/securesms/components/CircleColorImageView.java b/src/org/thoughtcrime/securesms/components/CircleColorImageView.java index 1bb04a48bf..7fefb89372 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 org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/components/ComposeText.java b/src/org/thoughtcrime/securesms/components/ComposeText.java index bf592e347c..c711bb5417 100644 --- a/src/org/thoughtcrime/securesms/components/ComposeText.java +++ b/src/org/thoughtcrime/securesms/components/ComposeText.java @@ -4,14 +4,14 @@ 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 android.text.Editable; +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 a9029865db..24da9f3572 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 8beda22ff1..528e758b1d 100644 --- a/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java +++ b/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java @@ -5,8 +5,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 0b638eb269..31ca68d826 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 64ef25f266..ae7ba73202 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 002b62323c..8ae8404460 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 149a903b2d..45447186f8 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 44a8daa9e7..38a64effc4 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 c3f58ebc55..1de60b8233 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 org.thoughtcrime.securesms.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 0344fbb8aa..06acfcec67 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 org.thoughtcrime.securesms.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 c0918dbdf3..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 org.thoughtcrime.securesms.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 51f615989f..ab4970f2bc 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 org.thoughtcrime.securesms.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 bb30eeaa71..b401fd5cac 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 673e9dbb79..7e9624a913 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 af30d5fd8e..d697761a9d 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 7240784802..c21cba8a57 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 7f129e7d0d..53b4b83590 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 a4f17c9a03..a42c341c56 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 org.thoughtcrime.securesms.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 b35c2367fb..2f11f25161 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/OutlinedThumbnailView.java b/src/org/thoughtcrime/securesms/components/OutlinedThumbnailView.java index 861587c83d..f94d8a315f 100644 --- a/src/org/thoughtcrime/securesms/components/OutlinedThumbnailView.java +++ b/src/org/thoughtcrime/securesms/components/OutlinedThumbnailView.java @@ -1,43 +1,16 @@ package org.thoughtcrime.securesms.components; import android.content.Context; -import android.content.res.TypedArray; import android.graphics.Canvas; -import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.UiThread; -import android.util.AttributeSet; -import android.view.View; -import android.view.ViewGroup; -import android.widget.FrameLayout; -import android.widget.ImageView; -import com.bumptech.glide.RequestBuilder; -import com.bumptech.glide.load.engine.DiskCacheStrategy; -import com.bumptech.glide.load.resource.bitmap.BitmapTransformation; -import com.bumptech.glide.load.resource.bitmap.CenterCrop; -import com.bumptech.glide.load.resource.bitmap.FitCenter; -import com.bumptech.glide.load.resource.bitmap.RoundedCorners; -import com.bumptech.glide.request.RequestOptions; +import androidx.annotation.NonNull; +import androidx.annotation.UiThread; +import android.util.AttributeSet; import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.database.AttachmentDatabase; -import org.thoughtcrime.securesms.logging.Log; -import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri; import org.thoughtcrime.securesms.mms.GlideRequest; import org.thoughtcrime.securesms.mms.GlideRequests; -import org.thoughtcrime.securesms.mms.Slide; -import org.thoughtcrime.securesms.mms.SlideClickListener; -import org.thoughtcrime.securesms.mms.SlidesClickedListener; import org.thoughtcrime.securesms.util.ThemeUtil; -import org.thoughtcrime.securesms.util.Util; -import org.thoughtcrime.securesms.util.ViewUtil; -import org.thoughtcrime.securesms.util.concurrent.ListenableFuture; -import org.thoughtcrime.securesms.util.concurrent.SettableFuture; -import org.whispersystems.libsignal.util.guava.Optional; - -import java.util.Collections; -import java.util.Locale; import static com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions.withCrossFade; diff --git a/src/org/thoughtcrime/securesms/components/Outliner.java b/src/org/thoughtcrime/securesms/components/Outliner.java index e2c8e71d26..64a4bfbb86 100644 --- a/src/org/thoughtcrime/securesms/components/Outliner.java +++ b/src/org/thoughtcrime/securesms/components/Outliner.java @@ -1,16 +1,12 @@ 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; +import androidx.annotation.NonNull; public class Outliner { diff --git a/src/org/thoughtcrime/securesms/components/PushRecipientsPanel.java b/src/org/thoughtcrime/securesms/components/PushRecipientsPanel.java index f78019d8bb..e9494f9157 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 8d15554e0b..57a59e7d1b 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 578640c7b7..ec91dab1c2 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 9fa8719c5b..a094bf4b76 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 f6567b43eb..1530a744cd 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 b31828ce04..3045955749 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 f645f8f157..1ac87e56b9 100644 --- a/src/org/thoughtcrime/securesms/components/SearchToolbar.java +++ b/src/org/thoughtcrime/securesms/components/SearchToolbar.java @@ -6,10 +6,10 @@ 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 androidx.annotation.MainThread; +import androidx.annotation.Nullable; +import androidx.appcompat.widget.SearchView; +import androidx.appcompat.widget.Toolbar; import android.util.AttributeSet; import android.view.MenuItem; import android.view.View; @@ -56,7 +56,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(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 476b99fa59..60824cea6e 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 7aa20a6c68..33245071a1 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 82206c0b13..77053847ce 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 77f2a1a176..620d423b30 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 org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java b/src/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java index 37aee0527d..42200c1dd3 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 5c65b367df..a3f4226113 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 929840c24a..3381fe0cbf 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 2910caa5a7..1d67cb0351 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 422e62b95f..125a38601c 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 org.thoughtcrime.securesms.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 5c26d910e3..b9f30f520b 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.jobs.TypingSendJob; diff --git a/src/org/thoughtcrime/securesms/components/ZoomingImageView.java b/src/org/thoughtcrime/securesms/components/ZoomingImageView.java index 6733433e4b..c1b4f42db4 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 082896e021..09294c3831 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 4da39902b0..1b59f667cb 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 9b513da565..6f84aea7a0 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 5036ed32cd..b385d1a9d3 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 8516f0ce6f..61eb8823e7 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 78ef324b0b..7f19e2d8a8 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 c812daa4b5..9a55280a73 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 39b33ed48a..781691ec10 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 org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java index eaacb010e7..21feb8bd70 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 1d3309e973..15e2e5ef7c 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java +++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java @@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.components.emoji; import android.content.Context; 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.R; diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java index 981759dec1..5700aed5aa 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 9fddd4600e..29e8b47671 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 1e5a5aa705..440ce88e1e 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 16620c58fb..19e05eae67 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..aa5f211b2b 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java +++ b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java @@ -6,11 +6,9 @@ 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; @@ -21,7 +19,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 6565963802..49cedfc3ee 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 org.thoughtcrime.securesms.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 6b03ca4c9d..bcb8de891d 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 ed41a723d8..3db38393ea 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 org.thoughtcrime.securesms.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 b5a2219ee0..dabfbe639a 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 7d2b744610..21cdf2d5dc 100644 --- a/src/org/thoughtcrime/securesms/components/registration/CallMeCountDownView.java +++ b/src/org/thoughtcrime/securesms/components/registration/CallMeCountDownView.java @@ -2,21 +2,14 @@ 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 androidx.annotation.Nullable; +import androidx.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 org.thoughtcrime.securesms.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 c40d473eb4..ac7a233fcd 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 3b37034288..f3265afb68 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 901896ebdc..2148293f5a 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 org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/components/reminder/InviteReminder.java b/src/org/thoughtcrime/securesms/components/reminder/InviteReminder.java index 689c127960..3699303bf5 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 7ca091d97a..9dc7a8e03f 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 org.thoughtcrime.securesms.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 13e9778a0a..8298deaa55 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..fe4c0f622b 100644 --- a/src/org/thoughtcrime/securesms/components/webrtc/PercentFrameLayout.java +++ b/src/org/thoughtcrime/securesms/components/webrtc/PercentFrameLayout.java @@ -11,21 +11,12 @@ 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 androidx.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 54753935e5..0505ba425a 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 b02cb631cb..dc65513833 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 org.thoughtcrime.securesms.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 81416b6614..4cf72818ac 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 org.thoughtcrime.securesms.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/ContactSelectionListAdapter.java b/src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java index 3901182356..dfbdddea9e 100644 --- a/src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java +++ b/src/org/thoughtcrime/securesms/contacts/ContactSelectionListAdapter.java @@ -20,9 +20,9 @@ import android.content.Context; import android.content.res.TypedArray; import android.database.Cursor; import android.provider.ContactsContract; -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.text.SpannableString; import android.text.Spanned; import android.text.TextUtils; @@ -36,16 +36,12 @@ import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.components.RecyclerViewFastScroller.FastScrollAdapter; import org.thoughtcrime.securesms.contacts.ContactSelectionListAdapter.HeaderViewHolder; import org.thoughtcrime.securesms.contacts.ContactSelectionListAdapter.ViewHolder; -import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter; import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.util.StickyHeaderDecoration.StickyHeaderAdapter; -import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.Util; -import java.util.HashMap; import java.util.HashSet; -import java.util.Map; import java.util.Set; /** diff --git a/src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java b/src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java index d1574fe603..e9dc9e729c 100644 --- a/src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java +++ b/src/org/thoughtcrime/securesms/contacts/ContactSelectionListItem.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.contacts; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; diff --git a/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java b/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java index 4045faf679..33acec6e48 100644 --- a/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java +++ b/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java @@ -22,8 +22,8 @@ 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 org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java b/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java index adab0bca51..b552f48189 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 560494962a..0812cd9d15 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 62f4cd26a6..d037bcadc7 100644 --- a/src/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java +++ b/src/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java @@ -3,12 +3,11 @@ 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; -import org.thoughtcrime.securesms.util.Conversions; import java.io.IOException; import java.io.InputStream; diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java index c4010bef63..6c23bd471d 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 33c2064b1f..318d3a131b 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 6ffc9a2789..25fec500d2 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..70b2502bac 100644 --- a/src/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java +++ b/src/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java @@ -1,10 +1,9 @@ package org.thoughtcrime.securesms.contactshare; -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; 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 b185001f36..11a85d46f4 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 bb6702765f..785aecff88 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 org.thoughtcrime.securesms.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 866a6c7c2e..370829020d 100644 --- a/src/org/thoughtcrime/securesms/contactshare/ContactShareEditAdapter.java +++ b/src/org/thoughtcrime/securesms/contactshare/ContactShareEditAdapter.java @@ -1,19 +1,16 @@ 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 org.thoughtcrime.securesms.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 a70a02087c..c491ba1574 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 80f0024ddf..5a4a261ff1 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 2f9ba7c840..2dcdd1a76c 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,16 +42,16 @@ import android.os.Vibrator; import android.provider.Browser; import android.provider.ContactsContract; import android.provider.Telephony; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -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.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 e48a44c8bf..6dbde27be8 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 f589fa21db..21db5ec75f 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 ca157cd76a..7e46e2dec5 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; @@ -57,7 +57,6 @@ import org.thoughtcrime.securesms.ConfirmIdentityDialog; import org.thoughtcrime.securesms.MediaPreviewActivity; import org.thoughtcrime.securesms.MessageDetailsActivity; import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.attachments.Attachment; import org.thoughtcrime.securesms.attachments.DatabaseAttachment; import org.thoughtcrime.securesms.components.AlertView; import org.thoughtcrime.securesms.components.AudioView; diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java index e7e71e6a75..2101069a9b 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 org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.logging.Log; 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 0e903992cc..a81d14d7b6 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 3e349c0174..f2ad87de18 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 541ab96955..8dbeca26b8 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 910d847091..4bee312a0d 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 0542dbd73f..2d569ccaf4 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 319d2b6a89..6879fdfffd 100644 --- a/src/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java +++ b/src/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.crypto; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; 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 4e030f4433..fda485b9c1 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.certificate.CertificateValidator; import org.signal.libsignal.metadata.certificate.InvalidCertificateException; 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 882887ec57..77ee9bb488 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 c87352d194..2920c0a272 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 0827a2bd1a..d5e46f6888 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 63c01c3903..81a9645900 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 038832364d..23b36dc63f 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 9b66d0bfb6..f4a9d3df5e 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 845ba29cc6..607ba66ca2 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; @@ -24,7 +24,6 @@ import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPoin import java.io.Closeable; import java.io.IOException; -import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.util.Collections; import java.util.LinkedList; 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 91f79c5e08..c2870723b3 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 28c9611d6a..aca3158231 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; @@ -27,7 +27,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.function.Consumer; public class RecipientDatabase extends Database { 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 3329e08ea3..f42237571c 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 071714e1f1..33733f03c4 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 05bdf74e30..0bd67c024e 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 821befc565..0c47493090 100644 --- a/src/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java +++ b/src/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java @@ -10,7 +10,7 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.net.Uri; import android.provider.ContactsContract; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import org.thoughtcrime.securesms.logging.Log; 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 a630510f03..eba8140a78 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 8ab0b6b7f3..678ec09a7d 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 b6b7ed1be3..3ab7b7a95f 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 org.thoughtcrime.securesms.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 22b85a19a8..24375b4ce3 100644 --- a/src/org/thoughtcrime/securesms/database/loaders/CountryListLoader.java +++ b/src/org/thoughtcrime/securesms/database/loaders/CountryListLoader.java @@ -9,7 +9,7 @@ import java.util.Map; import java.util.Set; import android.content.Context; -import android.support.v4.content.AsyncTaskLoader; +import androidx.loader.content.AsyncTaskLoader; import com.google.i18n.phonenumbers.PhoneNumberUtil; diff --git a/src/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java b/src/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java index 7d653dff84..ae1807b5f4 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 android.text.TextUtils; 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 b0a22c36c0..b23be13217 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 0933e34287..cfe7d2acd8 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 org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/database/model/MessageRecord.java b/src/org/thoughtcrime/securesms/database/model/MessageRecord.java index 635a864aa9..54bc736e5a 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 fafb2e9519..83212609bc 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 org.thoughtcrime.securesms.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 ea2e1d3af1..0b5e6801a9 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.R; 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 57d84a895b..2ff72763ae 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/gcm/FcmService.java b/src/org/thoughtcrime/securesms/gcm/FcmService.java index e7dd5ac17d..12a1f2f891 100644 --- a/src/org/thoughtcrime/securesms/gcm/FcmService.java +++ b/src/org/thoughtcrime/securesms/gcm/FcmService.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.gcm; import android.content.Context; import android.os.PowerManager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.google.firebase.messaging.FirebaseMessagingService; import com.google.firebase.messaging.RemoteMessage; diff --git a/src/org/thoughtcrime/securesms/gcm/FcmUtil.java b/src/org/thoughtcrime/securesms/gcm/FcmUtil.java index 2a2e2b04d5..05c90122aa 100644 --- a/src/org/thoughtcrime/securesms/gcm/FcmUtil.java +++ b/src/org/thoughtcrime/securesms/gcm/FcmUtil.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.gcm; -import android.support.annotation.WorkerThread; +import androidx.annotation.WorkerThread; import android.text.TextUtils; import com.google.firebase.iid.FirebaseInstanceId; diff --git a/src/org/thoughtcrime/securesms/giph/model/ChunkedImageUrl.java b/src/org/thoughtcrime/securesms/giph/model/ChunkedImageUrl.java index d425c0ceac..69bce8de4e 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 5cf573bafd..9601ea0452 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 59a2f58f7b..8971c4db45 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 5d731a5e99..340efcd10d 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 7a6e668ad6..83f3a8bb15 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 7c59d604f5..ceb97c96e3 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 4033a8823f..054e546545 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 ffac880e83..34f3a8b0bb 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 org.thoughtcrime.securesms.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 a8c72588fd..10b9c918b8 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 org.thoughtcrime.securesms.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 6c15f2b2e6..65ddc1063b 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 org.thoughtcrime.securesms.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 7d7722c7a1..38bf1d18b2 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 f7f77b0aa4..acb573c4ca 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 156fdf9b0f..d4286d7ccd 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 947ed11250..77a6951ec3 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; diff --git a/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java b/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java index c09d50b334..ff9996d578 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 b97a410dbd..b02e50a85b 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; 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 464d6e6a25..cae31381a6 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/DirectoryRefreshJob.java b/src/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java index 5b367dd335..590ff376ef 100644 --- a/src/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java +++ b/src/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java @@ -1,8 +1,8 @@ package org.thoughtcrime.securesms.jobs; import android.app.Application; -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.jobmanager.Data; 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/FcmRefreshJob.java b/src/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java index 458db590a2..72e5b02fb6 100644 --- a/src/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java +++ b/src/org/thoughtcrime/securesms/jobs/FcmRefreshJob.java @@ -21,8 +21,8 @@ import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.graphics.BitmapFactory; -import android.support.annotation.NonNull; -import android.support.v4.app.NotificationCompat; +import androidx.annotation.NonNull; +import androidx.core.app.NotificationCompat; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; diff --git a/src/org/thoughtcrime/securesms/jobs/JobManagerFactories.java b/src/org/thoughtcrime/securesms/jobs/JobManagerFactories.java index af769eda20..cd23905a30 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 0849d22875..4fd58672a3 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.jobmanager.Data; diff --git a/src/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java b/src/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java index ac6e206930..5c340b4184 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 d3112ef61c..82e511ca4c 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 org.thoughtcrime.securesms.jobmanager.Data; 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 c828485c5d..42d3ab609a 100644 --- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java +++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java @@ -6,8 +6,8 @@ import android.content.res.AssetFileDescriptor; import android.database.Cursor; 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; diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java index 3476a6f034..ca3bb21993 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 fbee8fc3b8..7bdb22a471 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 3e27b5f89d..b1518c3a79 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.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.dependencies.InjectableType; diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java index 4fcc526b58..c2bc8a6a40 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.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java index 8a498d02cd..07b90fc28d 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.jobmanager.Data; import org.thoughtcrime.securesms.jobmanager.Job; 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 986ba78f2b..4f6ac2d243 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 81ea9a0f70..a1688b37a8 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; @@ -14,7 +14,6 @@ import org.thoughtcrime.securesms.attachments.DatabaseAttachment; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; -import org.thoughtcrime.securesms.database.GroupReceiptDatabase; import org.thoughtcrime.securesms.database.GroupReceiptDatabase.GroupReceiptInfo; import org.thoughtcrime.securesms.database.MmsDatabase; import org.thoughtcrime.securesms.database.NoSuchMessageException; @@ -33,7 +32,6 @@ import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.transport.RetryLaterException; import org.thoughtcrime.securesms.transport.UndeliverableMessageException; import org.thoughtcrime.securesms.util.GroupUtil; -import org.whispersystems.libsignal.util.Pair; import org.whispersystems.libsignal.util.guava.Optional; import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair; diff --git a/src/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java index b5615fed87..3490bb0219 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 66cd7919ba..ec1b836e6b 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 dcc5c706c0..f421b5552b 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 53641a080e..cdd388503a 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.ApplicationContext; import org.thoughtcrime.securesms.database.Address; diff --git a/src/org/thoughtcrime/securesms/jobs/PushSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushSendJob.java index 8cf7bdef15..a1e010ebe2 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; diff --git a/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java index 1b4c7edf37..77430a9546 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 org.thoughtcrime.securesms.database.MessagingDatabase.SyncMessageId; import org.thoughtcrime.securesms.database.RecipientDatabase.UnidentifiedAccessMode; 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 76fb1e186d..8234d35307 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.ApplicationContext; import org.thoughtcrime.securesms.crypto.IdentityKeyUtil; 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 5db8442810..79e5f6eb0d 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 45f551d5aa..6ef87c321a 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 e7effa2eb5..1ed60fea50 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 66c94aab80..37e02e260d 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 0d776b089b..70758cd170 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 b008edb95e..eae7189f9e 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 b6d989c89d..525d412292 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 org.thoughtcrime.securesms.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 b5a0cad462..bf6b8c7aee 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.BuildConfig; diff --git a/src/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java b/src/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java index 69a6e5c12b..19a317e219 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.jobmanager.Data; diff --git a/src/org/thoughtcrime/securesms/jobs/SmsSendJob.java b/src/org/thoughtcrime/securesms/jobs/SmsSendJob.java index 0f33579374..d07d6e7c56 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; diff --git a/src/org/thoughtcrime/securesms/jobs/SmsSentJob.java b/src/org/thoughtcrime/securesms/jobs/SmsSentJob.java index cadecd0b81..cb232e00b6 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; 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 6cc0f8066d..fa381acaeb 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 org.thoughtcrime.securesms.jobmanager.Data; import org.thoughtcrime.securesms.jobmanager.Job; diff --git a/src/org/thoughtcrime/securesms/linkpreview/LinkPreview.java b/src/org/thoughtcrime/securesms/linkpreview/LinkPreview.java index 00368652d4..7920046964 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 1e9fff7f65..f40fd1972b 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 b270fd95d0..ac5c45f6ca 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 344c1cda8b..2180e5f0a4 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 f21a0be4f0..e26d7f06f9 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/longmessage/LongMessageActivity.java b/src/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java index a71cad7192..d58c352385 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 78c06e045e..9392227db7 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 org.thoughtcrime.securesms.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 652f6ea308..82e8161b4c 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 27ad889353..059dc5ca63 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 e6a90c6c16..e46711306a 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 5a80788965..293b394e74 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 d8eb218c9f..fbdad89a0c 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; @@ -25,7 +25,6 @@ import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.util.Util; import java.util.ArrayList; -import java.util.Collections; import java.util.List; /** diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaRepository.java b/src/org/thoughtcrime/securesms/mediasend/MediaRepository.java index 8d32234be1..ce75dbb6b8 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 41edfe10ed..ee48279695 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 4f3cd2bd7b..e9f75954ac 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 b471878155..08a38be526 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 cc751cb848..165d1b3ca8 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 9ca0f368f1..64478d595f 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 org.thoughtcrime.securesms.TransportOption; 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 90a6bf87ae..7aac798b77 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 org.thoughtcrime.securesms.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 cac0487787..9100ccb407 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 org.thoughtcrime.securesms.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 8ca92b5dc6..c86fb32d99 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 a59b6facdb..43f6e885a1 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.R; import org.thoughtcrime.securesms.attachments.Attachment; 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 b1f174bbe1..47bd43af37 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 org.thoughtcrime.securesms.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 e848fe3b11..4c6f245a64 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 ba1032f634..8bc9cf6fb2 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.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo; diff --git a/src/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java b/src/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java index c6c91ab02f..31d704f9b2 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.database.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java b/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java index 670fe42ce5..d7b0cf02f5 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 e9ded55fac..f563d4cb1e 100644 --- a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java +++ b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.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.R; diff --git a/src/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java b/src/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java index 7daca4a107..218cb67a29 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 org.thoughtcrime.securesms.ConversationListActivity; import org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/notifications/NotificationChannels.java b/src/org/thoughtcrime/securesms/notifications/NotificationChannels.java index 1777351aa1..ed2cafeb42 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/PendingMessageNotificationBuilder.java b/src/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java index 2cd058898e..eca8a36913 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.ConversationListActivity; import org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java b/src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java index 1f36a125f9..3cd7789c68 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.database.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; diff --git a/src/org/thoughtcrime/securesms/notifications/ReplyMethod.java b/src/org/thoughtcrime/securesms/notifications/ReplyMethod.java index fe660f1ec8..cd1e35c9b8 100644 --- a/src/org/thoughtcrime/securesms/notifications/ReplyMethod.java +++ b/src/org/thoughtcrime/securesms/notifications/ReplyMethod.java @@ -1,7 +1,7 @@ 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; diff --git a/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java b/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java index 83ecb8858d..207ffd21a7 100644 --- a/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java +++ b/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java @@ -7,12 +7,12 @@ import android.graphics.Bitmap; 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 5030a5c64a..ad9f83e029 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 39de72ecaa..a29d380f46 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 b70addfe42..1242decc2c 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 org.thoughtcrime.securesms.logging.Log; import android.widget.Toast; diff --git a/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java index aa85a68d9a..89f3342b76 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 4da08ec32d..c444ec6b73 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 org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/preferences/BlockedContactListItem.java b/src/org/thoughtcrime/securesms/preferences/BlockedContactListItem.java index 68366fbfb3..bca2027d75 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 05d4999a4d..e6e3c567b6 100644 --- a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java @@ -5,12 +5,12 @@ 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.ListPreference; -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.ListPreference; +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 c311ff4d4b..43f93a230a 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 274fedeae9..acf3657001 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 org.thoughtcrime.securesms.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 e93beff2d3..bf42bc01fd 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 org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java index 54ce541076..ededd69dfd 100644 --- a/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java +++ b/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java @@ -9,9 +9,9 @@ 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.ApplicationPreferencesActivity; diff --git a/src/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java index bf1f7b5256..424c89e86a 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 org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreference.java b/src/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreference.java index de95dcd514..8655ea317f 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 8a9f0e0af9..b8707fd605 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 5781d127ae..efa9ba2b28 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 e2afb38192..b87551536c 100644 --- a/src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java +++ b/src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java @@ -3,9 +3,9 @@ package org.thoughtcrime.securesms.preferences.widgets; import android.content.Context; 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.widget.ImageView; diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/ProgressPreference.java b/src/org/thoughtcrime/securesms/preferences/widgets/ProgressPreference.java index c47a862518..2a33d81318 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 a18d3a0556..940c53ba42 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 org.thoughtcrime.securesms.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 d94ab8ac2e..33c80415fd 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 47bd3db448..93978bb68f 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 55aa99aae2..8a9e76d43a 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 60ffd4bde7..0cdb50da9a 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 2fb4cf2f0c..3c663daaaf 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 org.thoughtcrime.securesms.logging.Log; import android.webkit.MimeTypeMap; diff --git a/src/org/thoughtcrime/securesms/providers/MmsBodyProvider.java b/src/org/thoughtcrime/securesms/providers/MmsBodyProvider.java index 83dd487947..3bf0a22a4e 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 0468e7a307..d608648ec1 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 4b97b529cc..9008ee98a6 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.BuildConfig; import org.thoughtcrime.securesms.util.TextSecurePreferences; diff --git a/src/org/thoughtcrime/securesms/qr/QrCode.java b/src/org/thoughtcrime/securesms/qr/QrCode.java index 691d7fec1f..e8564ed514 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 org.thoughtcrime.securesms.logging.Log; import com.google.zxing.BarcodeFormat; diff --git a/src/org/thoughtcrime/securesms/qr/ScanningThread.java b/src/org/thoughtcrime/securesms/qr/ScanningThread.java index 0b38a6afeb..31c061b273 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 org.thoughtcrime.securesms.logging.Log; import com.google.zxing.BinaryBitmap; diff --git a/src/org/thoughtcrime/securesms/recipients/Recipient.java b/src/org/thoughtcrime/securesms/recipients/Recipient.java index 06456bc4c7..ec144f6302 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 android.text.TextUtils; import com.annimon.stream.function.Consumer; @@ -48,7 +48,6 @@ import org.thoughtcrime.securesms.notifications.NotificationChannels; import org.thoughtcrime.securesms.recipients.RecipientProvider.RecipientDetails; import org.thoughtcrime.securesms.util.FutureTaskListener; import org.thoughtcrime.securesms.util.ListenableFutureTask; -import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.Util; import org.whispersystems.libsignal.util.guava.Optional; diff --git a/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java b/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java index 9c4d72f0dd..1140d5d9c3 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 org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/registration/CaptchaActivity.java b/src/org/thoughtcrime/securesms/registration/CaptchaActivity.java index 0019299efd..6af13b5a04 100644 --- a/src/org/thoughtcrime/securesms/registration/CaptchaActivity.java +++ b/src/org/thoughtcrime/securesms/registration/CaptchaActivity.java @@ -4,20 +4,11 @@ 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 androidx.annotation.Nullable; + 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 156546615a..0e3bc5fe99 100644 --- a/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java +++ b/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java @@ -2,9 +2,8 @@ package org.thoughtcrime.securesms.registration; import android.Manifest; import android.content.Intent; -import android.os.Build; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.thoughtcrime.securesms.BaseActionBarActivity; import org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java b/src/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java index 18114a68bc..85085182ed 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 50299db495..85ada5c0a1 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 1bf264406d..0e1a02ce16 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 org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/scribbles/StickerSelectFragment.java b/src/org/thoughtcrime/securesms/scribbles/StickerSelectFragment.java index e3f7510fa6..8c85627533 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 509b5c1f91..ffcb9bdf01 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 8d5275b00f..e7b8414cf8 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 3598aaad27..68983c3b80 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 a88107b211..0f21d93d90 100644 --- a/src/org/thoughtcrime/securesms/search/SearchRepository.java +++ b/src/org/thoughtcrime/securesms/search/SearchRepository.java @@ -5,7 +5,7 @@ import android.content.Context; import android.database.Cursor; import android.database.DatabaseUtils; import android.database.MergeCursor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.text.TextUtils; import com.annimon.stream.Stream; @@ -26,7 +26,6 @@ import org.thoughtcrime.securesms.search.model.MessageResult; import org.thoughtcrime.securesms.search.model.SearchResult; import org.thoughtcrime.securesms.util.Stopwatch; -import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; 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 0436711b16..70c27091ad 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.ConversationListActivity; import org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/service/ContactsSyncAdapterService.java b/src/org/thoughtcrime/securesms/service/ContactsSyncAdapterService.java index c162d9104d..71f8be852b 100644 --- a/src/org/thoughtcrime/securesms/service/ContactsSyncAdapterService.java +++ b/src/org/thoughtcrime/securesms/service/ContactsSyncAdapterService.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.service; import android.app.Service; import android.content.Intent; import android.os.IBinder; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.thoughtcrime.securesms.contacts.ContactsSyncAdapter; 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 4cfe8988fd..a0eea63670 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.ConversationListActivity; import org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/service/IncomingMessageObserver.java b/src/org/thoughtcrime/securesms/service/IncomingMessageObserver.java index c0d7ac95aa..82e1b3e31e 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.jobmanager.ConstraintObserver; import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; diff --git a/src/org/thoughtcrime/securesms/service/KeyCachingService.java b/src/org/thoughtcrime/securesms/service/KeyCachingService.java index 1dcbb8347b..a34800073b 100644 --- a/src/org/thoughtcrime/securesms/service/KeyCachingService.java +++ b/src/org/thoughtcrime/securesms/service/KeyCachingService.java @@ -17,7 +17,6 @@ package org.thoughtcrime.securesms.service; import android.annotation.SuppressLint; -import android.annotation.TargetApi; import android.app.AlarmManager; import android.app.Notification; import android.app.PendingIntent; @@ -26,16 +25,14 @@ import android.content.Context; import android.content.Intent; import android.os.AsyncTask; import android.os.Binder; -import android.os.Build; 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.logging.Log; -import android.widget.RemoteViews; import org.thoughtcrime.securesms.ConversationListActivity; import org.thoughtcrime.securesms.DatabaseUpgradeActivity; diff --git a/src/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java b/src/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java index 50f5ded14c..e1d1f7280d 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 org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/service/WebRtcCallService.java b/src/org/thoughtcrime/securesms/service/WebRtcCallService.java index 96800516ae..1ded85cbc2 100644 --- a/src/org/thoughtcrime/securesms/service/WebRtcCallService.java +++ b/src/org/thoughtcrime/securesms/service/WebRtcCallService.java @@ -15,9 +15,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; diff --git a/src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java b/src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java index 256a93b32a..92c53ea6d2 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 ea0a27bbbc..e5a0199429 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.database.MessagingDatabase.SyncMessageId; import org.thoughtcrime.securesms.database.MmsSmsDatabase; 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 fd218167ce..7f8543d584 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 346a654a83..0bd3b30fae 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 9252e7b9f2..df9ab953bc 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.R; 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 8d7e965849..7f4c77ab3b 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 a5b121995e..24fd5b0811 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 794455b797..6027daa84d 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 8a4ae902fe..7d1d839eb1 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 da2371aa4d..02ca9f263a 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; import com.google.android.gms.common.util.Hex; 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 7a6b73b699..57a09b1504 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 fcb30af9b5..35c2244cc1 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 178fb88169..1edeccd4fe 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 com.google.android.gms.common.util.Hex; 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 81c338b370..ef17f28f23 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 87e3c6e1e4..2e03835a4e 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 org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/util/BitmapUtil.java b/src/org/thoughtcrime/securesms/util/BitmapUtil.java index 4423405d73..2cf26f5bf5 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 1df299cefa..6665be8bdc 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 b60a927aeb..d5d7c6d950 100644 --- a/src/org/thoughtcrime/securesms/util/DateUtils.java +++ b/src/org/thoughtcrime/securesms/util/DateUtils.java @@ -17,8 +17,8 @@ package org.thoughtcrime.securesms.util; import android.content.Context; -import android.os.Build; -import android.support.annotation.NonNull; + +import androidx.annotation.NonNull; import android.text.format.DateFormat; import org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/util/Dialogs.java b/src/org/thoughtcrime/securesms/util/Dialogs.java index 0f2937457d..570b19f1fe 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 org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/util/DirectoryHelper.java b/src/org/thoughtcrime/securesms/util/DirectoryHelper.java index 7f8563a590..0548b6168f 100644 --- a/src/org/thoughtcrime/securesms/util/DirectoryHelper.java +++ b/src/org/thoughtcrime/securesms/util/DirectoryHelper.java @@ -11,8 +11,8 @@ import android.database.Cursor; import android.net.Uri; import android.os.RemoteException; 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/util/FileProviderUtil.java b/src/org/thoughtcrime/securesms/util/FileProviderUtil.java index 5cf06dad75..44de0078d1 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 77b878e0ee..2ca0a710ab 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; @@ -15,7 +15,6 @@ import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.OutgoingGroupMediaMessage; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientModifiedListener; -import org.thoughtcrime.securesms.sms.MessageSender; import org.whispersystems.libsignal.util.guava.Optional; import java.io.IOException; diff --git a/src/org/thoughtcrime/securesms/util/IdentityUtil.java b/src/org/thoughtcrime/securesms/util/IdentityUtil.java index 89ce2e5996..d6d66ce9e5 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.R; import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore; 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 243f984bd3..33da1b84a7 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 25628f2b0c..dc1f859194 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 9be8fe1d0d..1a2af68df2 100644 --- a/src/org/thoughtcrime/securesms/util/ResUtil.java +++ b/src/org/thoughtcrime/securesms/util/ResUtil.java @@ -21,12 +21,12 @@ 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 android.support.v7.content.res.AppCompatResources; +import androidx.annotation.ArrayRes; +import androidx.annotation.AttrRes; +import androidx.annotation.DimenRes; +import androidx.annotation.NonNull; +import androidx.core.content.ContextCompat; +import androidx.appcompat.content.res.AppCompatResources; 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 8a7ae7e062..e44280e700 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 0ac37ca6ce..8f1d244edb 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 a119213feb..02d757a65c 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 com.google.i18n.phonenumbers.NumberParseException; import com.google.i18n.phonenumbers.PhoneNumberUtil; 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 1b7c834f22..52e7ab93cc 100644 --- a/src/org/thoughtcrime/securesms/util/StorageUtil.java +++ b/src/org/thoughtcrime/securesms/util/StorageUtil.java @@ -1,12 +1,8 @@ package org.thoughtcrime.securesms.util; import android.content.Context; -import android.os.Build; import android.os.Environment; -import android.support.annotation.Nullable; - -import com.annimon.stream.Objects; -import com.annimon.stream.Stream; +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 0b38c403b8..f0f3017b3e 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.R; diff --git a/src/org/thoughtcrime/securesms/util/ThemeUtil.java b/src/org/thoughtcrime/securesms/util/ThemeUtil.java index 719a93b494..0c61d9c43b 100644 --- a/src/org/thoughtcrime/securesms/util/ThemeUtil.java +++ b/src/org/thoughtcrime/securesms/util/ThemeUtil.java @@ -3,13 +3,12 @@ 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; -import android.view.View; import org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/util/Util.java b/src/org/thoughtcrime/securesms/util/Util.java index dfe23ef77f..3027ac97c1 100644 --- a/src/org/thoughtcrime/securesms/util/Util.java +++ b/src/org/thoughtcrime/securesms/util/Util.java @@ -30,9 +30,9 @@ 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 android.support.annotation.RequiresPermission; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresPermission; 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 6bffc0b4c1..8f9f426ea4 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 5146ff7f02..a4c153a035 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 org.thoughtcrime.securesms.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 2d532171dd..f0f8d18e07 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; @@ -30,26 +30,20 @@ import android.widget.Toast; import android.widget.VideoView; import com.google.android.exoplayer2.DefaultLoadControl; -import com.google.android.exoplayer2.ExoPlaybackException; -import com.google.android.exoplayer2.ExoPlayer; import com.google.android.exoplayer2.ExoPlayerFactory; import com.google.android.exoplayer2.LoadControl; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.SimpleExoPlayer; -import com.google.android.exoplayer2.Timeline; import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory; import com.google.android.exoplayer2.extractor.ExtractorsFactory; import com.google.android.exoplayer2.source.ExtractorMediaSource; import com.google.android.exoplayer2.source.MediaSource; -import com.google.android.exoplayer2.source.TrackGroupArray; import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection; import com.google.android.exoplayer2.trackselection.DefaultTrackSelector; import com.google.android.exoplayer2.trackselection.TrackSelection; -import com.google.android.exoplayer2.trackselection.TrackSelectionArray; import com.google.android.exoplayer2.trackselection.TrackSelector; import com.google.android.exoplayer2.ui.PlayerControlView; import com.google.android.exoplayer2.ui.PlayerView; -import com.google.android.exoplayer2.ui.SimpleExoPlayerView; import com.google.android.exoplayer2.upstream.BandwidthMeter; import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter; import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; 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 dd58294201..86dd848a30 100644 --- a/src/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java +++ b/src/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java @@ -1,22 +1,19 @@ package org.thoughtcrime.securesms.webrtc; import android.app.Notification; -import android.app.NotificationManager; import android.app.PendingIntent; -import android.app.Service; 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.R; import org.thoughtcrime.securesms.WebRtcCallActivity; import org.thoughtcrime.securesms.notifications.NotificationChannels; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.service.WebRtcCallService; -import org.thoughtcrime.securesms.util.ServiceUtil; /** * Manages the state of the WebRtc items in the Android notification bar. 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 1742d19ae6..1c17811d9e 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 org.thoughtcrime.securesms.R; diff --git a/src/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java b/src/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java index 570d0f0a6e..5b9d6d2a56 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 org.thoughtcrime.securesms.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;