From f8e6ead13fb4598153c2073acccbf4128a3b6963 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Wed, 22 Apr 2020 20:01:16 +0200 Subject: [PATCH] migrate AppID back to eu.siacs.conversations In coordination with @iNPUTmice, the AppllicationID is set back to the original one. This restores compatibility for the exchange of commits between Conversations and Pix-Art Messenger. See also #160. Currently it's not possible to use the DirectShare feature. We will look for a possible fix. --- proguard-rules.pro | 3 +- .../conversations}/services/EmojiService.java | 2 +- .../services/PushManagementService.java | 6 +- .../ui/widget/EmojiWrapperEditText.java | 2 +- .../utils/InstallReferrerUtils.java | 6 +- src/main/AndroidManifest.xml | 4 +- .../java/de/pixart/messenger/ui/StartUI.java | 7 +- .../pixart/messenger/xmpp/OnBindListener.java | 7 - .../messenger/xmpp/OnIqPacketReceived.java | 8 - .../xmpp/jingle/OnJinglePacketReceived.java | 9 - .../messenger/xmpp/jingle/Transport.java | 5 - .../siacs/conversations}/Config.java | 4 +- .../android/AbstractPhoneContact.java | 2 +- .../android/JabberIdContact.java | 4 +- .../crypto/DomainHostnameVerifier.java | 2 +- .../conversations}/crypto/OmemoSetting.java | 8 +- .../conversations}/crypto/OtrService.java | 18 +- .../crypto/PgpDecryptionService.java | 16 +- .../conversations}/crypto/PgpEngine.java | 22 +-- .../crypto/XmppDomainVerifier.java | 2 +- .../crypto/axolotl/AxolotlService.java | 32 ++-- .../axolotl/BrokenSessionException.java | 2 +- .../crypto/axolotl/CryptoFailedException.java | 2 +- .../crypto/axolotl/FingerprintStatus.java | 2 +- .../axolotl/NoSessionsCreatedException.java | 2 +- .../NotEncryptedForThisDeviceException.java | 2 +- .../axolotl/OnMessageCreatedCallback.java | 2 +- .../axolotl/OutdatedSenderException.java | 2 +- .../crypto/axolotl/SQLiteAxolotlStore.java | 10 +- .../crypto/axolotl/XmppAxolotlMessage.java | 8 +- .../crypto/axolotl/XmppAxolotlSession.java | 8 +- .../conversations}/crypto/sasl/Anonymous.java | 6 +- .../conversations}/crypto/sasl/DigestMd5.java | 8 +- .../conversations}/crypto/sasl/External.java | 6 +- .../conversations}/crypto/sasl/Plain.java | 6 +- .../crypto/sasl/SaslMechanism.java | 6 +- .../crypto/sasl/ScramMechanism.java | 8 +- .../conversations}/crypto/sasl/ScramSha1.java | 6 +- .../crypto/sasl/ScramSha256.java | 6 +- .../conversations}/crypto/sasl/Tokenizer.java | 2 +- .../entities/AbstractEntity.java | 2 +- .../conversations}/entities/Account.java | 24 +-- .../conversations}/entities/Blockable.java | 2 +- .../conversations}/entities/Bookmark.java | 12 +- .../conversations}/entities/Contact.java | 18 +- .../conversations}/entities/Conversation.java | 24 +-- .../entities/Conversational.java | 2 +- .../entities/DownloadableFile.java | 6 +- .../siacs/conversations}/entities/Edit.java | 2 +- .../entities/IndividualMessage.java | 4 +- .../conversations}/entities/ListItem.java | 4 +- .../conversations}/entities/MTMDecision.java | 2 +- .../conversations}/entities/Message.java | 28 +-- .../conversations}/entities/MucOptions.java | 24 +-- .../conversations}/entities/Presence.java | 4 +- .../entities/PresenceTemplate.java | 2 +- .../conversations}/entities/Presences.java | 2 +- .../conversations}/entities/RawBlockable.java | 4 +- .../conversations}/entities/ReadByMarker.java | 2 +- .../entities/ReceiptRequest.java | 2 +- .../siacs/conversations}/entities/Room.java | 8 +- .../siacs/conversations}/entities/Roster.java | 4 +- .../entities/ServiceDiscoveryResult.java | 12 +- .../entities/StubConversation.java | 2 +- .../conversations}/entities/Transferable.java | 2 +- .../entities/TransferablePlaceholder.java | 2 +- .../generator/AbstractGenerator.java | 20 +- .../conversations}/generator/IqGenerator.java | 30 +-- .../generator/MessageGenerator.java | 26 +-- .../generator/PresenceGenerator.java | 18 +- .../http/AesGcmURLStreamHandler.java | 2 +- .../http/CustomURLStreamHandlerFactory.java | 2 +- .../http/HttpConnectionManager.java | 14 +- .../http/HttpDownloadConnection.java | 28 +-- .../http/HttpUploadConnection.java | 24 +-- .../siacs/conversations}/http/Method.java | 6 +- .../http/NoSSLv3SocketFactory.java | 2 +- .../http/P1S3UrlStreamHandler.java | 4 +- .../conversations}/http/SlotRequester.java | 18 +- .../http/services/MuclumbusService.java | 4 +- .../conversations}/parser/AbstractParser.java | 18 +- .../siacs/conversations}/parser/IqParser.java | 30 +-- .../conversations}/parser/MessageParser.java | 68 +++---- .../conversations}/parser/PresenceParser.java | 40 ++-- .../persistance/DatabaseBackend.java | 38 ++-- .../persistance/FileBackend.java | 30 +-- .../persistance/OnPhoneContactsMerged.java | 2 +- .../services/AbstractConnectionManager.java | 10 +- .../AbstractQuickConversationsService.java | 2 +- .../services/AlarmReceiver.java | 6 +- .../AttachFileToConversationRunnable.java | 18 +- .../conversations}/services/AudioPlayer.java | 16 +- .../services/AvatarService.java | 34 ++-- .../services/BarcodeProvider.java | 8 +- .../services/ChannelDiscoveryService.java | 20 +- .../services/ContactChooserTargetService.java | 8 +- .../services/EventReceiver.java | 6 +- .../services/ExportBackupService.java | 26 +-- .../services/ImportBackupService.java | 24 +-- .../conversations}/services/MediaPlayer.java | 2 +- .../services/MemorizingTrustManager.java | 12 +- .../services/MessageArchiveService.java | 26 +-- .../services/MessageSearchTask.java | 24 +-- .../services/NotificationService.java | 40 ++-- .../services/QuickConversationsService.java | 2 +- .../services/ShortcutService.java | 12 +- .../services/UpdateService.java | 14 +- .../services/XmppConnectionService.java | 178 +++++++++--------- .../conversations}/ui/AboutActivity.java | 6 +- .../conversations}/ui/AboutPreference.java | 6 +- .../AbstractSearchableListItemActivity.java | 10 +- .../conversations}/ui/ActionBarActivity.java | 4 +- .../conversations}/ui/BlockContactDialog.java | 12 +- .../conversations}/ui/BlocklistActivity.java | 16 +- .../ui/ChangePasswordActivity.java | 12 +- .../ui/ChannelDiscoveryActivity.java | 26 +-- ...hooseAccountForProfilePictureActivity.java | 8 +- .../ui/ChooseContactActivity.java | 24 +-- .../ui/ConferenceDetailsActivity.java | 64 +++---- .../ui/ContactDetailsActivity.java | 66 +++---- .../ui/ConversationFragment.java | 130 ++++++------- .../ui/ConversationsActivity.java | 66 +++---- .../ui/ConversationsOverviewFragment.java | 22 +-- .../ui/CreatePrivateGroupChatDialog.java | 10 +- .../ui/CreatePublicChannelDialog.java | 20 +- .../ui/EditAccountActivity.java | 72 +++---- .../conversations}/ui/EnterJidDialog.java | 14 +- .../conversations}/ui/EnterNameActivity.java | 12 +- .../ui/ImportBackupActivity.java | 16 +- .../conversations}/ui/IntroActivity.java | 6 +- .../ui/JoinConferenceDialog.java | 12 +- .../conversations}/ui/LocationActivity.java | 4 +- .../ui/MagicCreateActivity.java | 14 +- .../ui/ManageAccountActivity.java | 22 +-- .../ui/MediaBrowserActivity.java | 24 +-- .../ui/MediaViewerActivity.java | 19 +- .../conversations}/ui/MemorizingActivity.java | 10 +- .../conversations}/ui/MucUsersActivity.java | 18 +- .../conversations}/ui/OmemoActivity.java | 18 +- ...ublishGroupChatProfilePictureActivity.java | 16 +- .../ui/PublishProfilePictureActivity.java | 14 +- .../conversations}/ui/RecordingActivity.java | 12 +- .../siacs/conversations}/ui/ScanActivity.java | 10 +- .../conversations}/ui/SearchActivity.java | 44 ++--- .../ui/SetSettingsActivity.java | 30 +-- .../conversations}/ui/SettingsActivity.java | 20 +- .../conversations}/ui/SettingsFragment.java | 8 +- .../ui/ShareLocationActivity.java | 8 +- .../ui/ShareViaAccountActivity.java | 10 +- .../conversations}/ui/ShareWithActivity.java | 14 +- .../conversations}/ui/ShortcutActivity.java | 10 +- .../ui/ShowLocationActivity.java | 8 +- .../ui/StartConversationActivity.java | 52 ++--- .../conversations}/ui/TimePreference.java | 2 +- .../conversations}/ui/TrustKeysActivity.java | 32 ++-- .../siacs/conversations}/ui/UiCallback.java | 2 +- .../ui/UiInformableCallback.java | 2 +- .../conversations}/ui/UpdaterActivity.java | 20 +- .../conversations}/ui/UriHandlerActivity.java | 12 +- .../conversations}/ui/VerifyOTRActivity.java | 18 +- .../conversations}/ui/WelcomeActivity.java | 24 +-- .../siacs/conversations}/ui/XmppActivity.java | 58 +++--- .../siacs/conversations}/ui/XmppFragment.java | 4 +- .../ui/adapter/AccountAdapter.java | 16 +- .../ui/adapter/BackupFileAdapter.java | 14 +- .../adapter/ChannelSearchResultAdapter.java | 12 +- .../ui/adapter/ConversationAdapter.java | 32 ++-- .../ui/adapter/KnownHostsAdapter.java | 2 +- .../ui/adapter/ListItemAdapter.java | 20 +- .../ui/adapter/MediaAdapter.java | 22 +-- .../ui/adapter/MediaPreviewAdapter.java | 12 +- .../ui/adapter/MessageAdapter.java | 90 ++++----- .../ui/adapter/PresenceTemplateAdapter.java | 4 +- .../ui/adapter/UserAdapter.java | 22 +-- .../ui/adapter/UserPreviewAdapter.java | 14 +- .../ui/forms/FormBooleanFieldWrapper.java | 6 +- .../ui/forms/FormFieldFactory.java | 4 +- .../ui/forms/FormFieldWrapper.java | 8 +- .../ui/forms/FormJidSingleFieldWrapper.java | 6 +- .../ui/forms/FormTextFieldWrapper.java | 6 +- .../conversations}/ui/forms/FormWrapper.java | 6 +- .../ui/interfaces/OnAvatarPublication.java | 2 +- .../ui/interfaces/OnBackendConnected.java | 2 +- .../ui/interfaces/OnConversationArchived.java | 4 +- .../ui/interfaces/OnConversationRead.java | 4 +- .../ui/interfaces/OnConversationSelected.java | 4 +- .../OnConversationsListItemUpdated.java | 2 +- .../ui/interfaces/OnMediaLoaded.java | 4 +- .../interfaces/OnSearchResultsAvailable.java | 4 +- .../ui/service/CameraManager.java | 4 +- .../conversations}/ui/text/DividerSpan.java | 2 +- .../conversations}/ui/text/FixedURLSpan.java | 8 +- .../conversations}/ui/text/QuoteSpan.java | 2 +- .../ui/util/ActivityResult.java | 2 +- .../conversations}/ui/util/Attachment.java | 6 +- .../ui/util/AvatarWorkerTask.java | 8 +- .../conversations}/ui/util/ChangeWatcher.java | 2 +- .../ui/util/ConversationMenuConfigurator.java | 16 +- .../conversations}/ui/util/DateSeparator.java | 8 +- .../ui/util/DelayedHintHelper.java | 2 +- .../util/EditMessageActionModeCallback.java | 6 +- .../conversations}/ui/util/GridManager.java | 6 +- .../conversations}/ui/util/IntroHelper.java | 10 +- .../conversations}/ui/util/JidDialog.java | 2 +- .../conversations}/ui/util/ListViewUtils.java | 2 +- .../ui/util/MucConfiguration.java | 6 +- .../ui/util/MucDetailsContextMenuHelper.java | 30 +-- .../conversations}/ui/util/MyLinkify.java | 16 +- .../ui/util/PendingActionHelper.java | 2 +- .../conversations}/ui/util/PendingItem.java | 2 +- .../ui/util/PresenceSelector.java | 12 +- .../conversations}/ui/util/ScrollState.java | 2 +- .../ui/util/SendButtonAction.java | 14 +- .../ui/util/SendButtonTool.java | 14 +- .../conversations}/ui/util/ShareUtil.java | 18 +- .../ui/util/SoftKeyboardUtils.java | 2 +- .../ui/util/StyledAttributes.java | 2 +- .../conversations}/ui/util/ViewUtil.java | 12 +- .../ui/widget/ClickableMovementMethod.java | 2 +- .../ui/widget/CopyTextView.java | 2 +- .../ui/widget/DisabledActionModeCallback.java | 2 +- .../conversations}/ui/widget/EditMessage.java | 6 +- .../ui/widget/FailedCountCustomView.java | 4 +- .../widget/ImmediateAutoCompleteTextView.java | 2 +- .../ui/widget/ListSelectionManager.java | 2 +- .../ui/widget/RichLinkView.java | 10 +- .../conversations}/ui/widget/ScannerView.java | 4 +- .../ui/widget/SquareFrameLayout.java | 2 +- .../ui/widget/TextInputEditText.java | 2 +- .../ui/widget/UnreadCountCustomView.java | 6 +- .../conversations}/utils/AccountUtils.java | 12 +- .../utils/AndroidUsingExecLowPriority.java | 2 +- .../utils/AndroidUsingLinkProperties.java | 2 +- .../utils/BackupFileHeader.java | 2 +- .../conversations}/utils/Cancellable.java | 2 +- .../utils/CharSequenceUtils.java | 2 +- .../siacs/conversations}/utils/Checksum.java | 2 +- .../conversations}/utils/Compatibility.java | 12 +- .../utils/ConversationsFileObserver.java | 4 +- .../conversations}/utils/CryptoHelper.java | 12 +- .../conversations}/utils/CursorUtils.java | 2 +- .../conversations}/utils/EmojiWrapper.java | 2 +- .../siacs/conversations}/utils/Emoticons.java | 2 +- .../utils/EncryptDecryptFile.java | 4 +- .../utils/ExceptionHandler.java | 2 +- .../conversations}/utils/ExceptionHelper.java | 16 +- .../conversations}/utils/ExifHelper.java | 2 +- .../siacs/conversations}/utils/FileUtils.java | 6 +- .../utils/FileWriterException.java | 2 +- .../utils/FirstStartManager.java | 2 +- .../siacs/conversations}/utils/FtsUtils.java | 2 +- .../siacs/conversations}/utils/GeoHelper.java | 14 +- .../siacs/conversations}/utils/IP.java | 2 +- .../conversations}/utils/ImStyleParser.java | 2 +- .../utils/IrregularUnicodeDetector.java | 6 +- .../siacs/conversations}/utils/JidHelper.java | 4 +- .../conversations}/utils/LanguageUtils.java | 2 +- .../conversations}/utils/LocationHelper.java | 4 +- .../utils/MenuDoubleTabUtil.java | 4 +- .../conversations}/utils/MessageUtils.java | 8 +- .../siacs/conversations}/utils/MetaData.java | 2 +- .../siacs/conversations}/utils/MimeUtils.java | 8 +- .../siacs/conversations}/utils/Namespace.java | 2 +- .../utils/NickValidityChecker.java | 4 +- .../utils/OnPhoneContactsLoadedListener.java | 2 +- .../siacs/conversations}/utils/PRNGFixes.java | 2 +- .../siacs/conversations}/utils/Patterns.java | 2 +- .../conversations}/utils/PermissionUtils.java | 2 +- .../conversations}/utils/PhoneHelper.java | 2 +- .../conversations}/utils/QuickLoader.java | 4 +- .../ReplacingSerialSingleThreadExecutor.java | 2 +- .../utils/ReplacingTaskManager.java | 4 +- .../siacs/conversations}/utils/Resolver.java | 10 +- .../conversations}/utils/RichPreview.java | 6 +- .../conversations}/utils/SSLSocketHelper.java | 6 +- .../utils/SerialSingleThreadExecutor.java | 4 +- .../conversations}/utils/SignupUtils.java | 20 +- .../utils/SocksSocketFactory.java | 4 +- .../conversations}/utils/StringUtils.java | 2 +- .../conversations}/utils/StylingHelper.java | 8 +- .../utils/TLSSocketFactory.java | 2 +- .../conversations}/utils/ThemeHelper.java | 6 +- .../conversations}/utils/TimeframeUtils.java | 4 +- .../conversations}/utils/TorServiceUtils.java | 4 +- .../siacs/conversations}/utils/UIHelper.java | 34 ++-- .../conversations}/utils/WakeLockHelper.java | 4 +- .../utils/WeakReferenceSet.java | 2 +- .../conversations}/utils/XEP0392Helper.java | 2 +- .../siacs/conversations}/utils/XmlHelper.java | 4 +- .../siacs/conversations}/utils/XmppUri.java | 2 +- .../siacs/conversations}/xml/Element.java | 8 +- .../conversations}/xml/LocalizedContent.java | 2 +- .../siacs/conversations}/xml/Tag.java | 4 +- .../siacs/conversations}/xml/TagWriter.java | 6 +- .../conversations}/xml/XmlElementReader.java | 2 +- .../siacs/conversations}/xml/XmlReader.java | 4 +- .../siacs/conversations}/xmpp/InvalidJid.java | 4 +- .../xmpp/OnAdvancedStreamFeaturesLoaded.java | 4 +- .../conversations/xmpp/OnBindListener.java | 7 + .../xmpp/OnContactStatusChanged.java | 4 +- .../xmpp/OnIqPacketReceived.java | 8 + .../xmpp/OnKeyStatusUpdated.java | 4 +- .../xmpp/OnMessageAcknowledged.java | 4 +- .../xmpp/OnMessagePacketReceived.java | 6 +- .../xmpp/OnNewKeysAvailable.java | 0 .../xmpp/OnPresencePacketReceived.java | 6 +- .../conversations}/xmpp/OnStatusChanged.java | 4 +- .../xmpp/OnUpdateBlocklist.java | 2 +- .../conversations}/xmpp/PacketReceived.java | 2 +- .../siacs/conversations}/xmpp/Patches.java | 2 +- .../conversations}/xmpp/XmppConnection.java | 98 +++++----- .../xmpp/chatstate/ChatState.java | 4 +- .../siacs/conversations}/xmpp/forms/Data.java | 6 +- .../conversations}/xmpp/forms/Field.java | 4 +- .../conversations}/xmpp/jid/OtrJidHelper.java | 2 +- .../xmpp/jingle/DirectConnectionUtils.java | 2 +- .../xmpp/jingle/JingleCandidate.java | 6 +- .../xmpp/jingle/JingleConnection.java | 48 ++--- .../xmpp/jingle/JingleConnectionManager.java | 24 +-- .../xmpp/jingle/JingleInBandTransport.java | 18 +- .../xmpp/jingle/JingleSocks5Transport.java | 20 +- .../xmpp/jingle/JingleTransport.java | 4 +- .../OnFileTransmissionStatusChanged.java | 4 +- .../xmpp/jingle/OnJinglePacketReceived.java | 9 + .../xmpp/jingle/OnPrimaryCandidateFound.java | 2 +- .../xmpp/jingle/OnTransportConnected.java | 2 +- .../conversations/xmpp/jingle/Transport.java | 5 + .../xmpp/jingle/stanzas/Content.java | 8 +- .../xmpp/jingle/stanzas/JinglePacket.java | 6 +- .../xmpp/jingle/stanzas/Reason.java | 4 +- .../conversations}/xmpp/mam/MamReference.java | 2 +- .../siacs/conversations}/xmpp/pep/Avatar.java | 4 +- .../xmpp/pep/PublishOptions.java | 8 +- .../AbstractAcknowledgeableStanza.java | 6 +- .../xmpp/stanzas/AbstractStanza.java | 6 +- .../conversations}/xmpp/stanzas/IqPacket.java | 4 +- .../xmpp/stanzas/MessagePacket.java | 8 +- .../xmpp/stanzas/PresencePacket.java | 2 +- .../xmpp/stanzas/csi/ActivePacket.java | 4 +- .../xmpp/stanzas/csi/InactivePacket.java | 4 +- .../xmpp/stanzas/streammgmt/AckPacket.java | 4 +- .../xmpp/stanzas/streammgmt/EnablePacket.java | 4 +- .../stanzas/streammgmt/RequestPacket.java | 4 +- .../xmpp/stanzas/streammgmt/ResumePacket.java | 4 +- src/main/res/layout/activity_about.xml | 2 +- .../res/layout/activity_change_password.xml | 4 +- src/main/res/layout/activity_edit_account.xml | 2 +- src/main/res/layout/activity_muc_details.xml | 4 +- src/main/res/layout/activity_scan.xml | 2 +- src/main/res/layout/conversation_list_row.xml | 4 +- .../res/layout/create_conference_dialog.xml | 2 +- .../layout/create_public_channel_dialog.xml | 2 +- src/main/res/layout/dialog_enter_password.xml | 2 +- src/main/res/layout/dialog_presence.xml | 2 +- src/main/res/layout/dialog_quickedit.xml | 4 +- src/main/res/layout/fragment_conversation.xml | 6 +- src/main/res/layout/media.xml | 4 +- src/main/res/layout/message_content.xml | 4 +- src/main/res/layout/user_preview.xml | 4 +- src/main/res/xml/preferences.xml | 20 +- src/playstore/AndroidManifest.xml | 4 +- .../conversations}/services/EmojiService.java | 6 +- .../services/MaintenanceReceiver.java | 11 +- .../services/PushManagementService.java | 22 +-- .../services/PushMessageReceiver.java | 6 +- .../ui/widget/EmojiWrapperEditText.java | 2 +- .../utils/InstallReferrerUtils.java | 6 +- 367 files changed, 2002 insertions(+), 1998 deletions(-) rename src/git/java/{de/pixart/messenger => eu/siacs/conversations}/services/EmojiService.java (95%) rename src/git/java/{de/pixart/messenger => eu/siacs/conversations}/services/PushManagementService.java (85%) rename src/git/java/{de/pixart/messenger => eu/siacs/conversations}/ui/widget/EmojiWrapperEditText.java (89%) rename src/git/java/{de/pixart/messenger => eu/siacs/conversations}/utils/InstallReferrerUtils.java (59%) delete mode 100644 src/main/java/de/pixart/messenger/xmpp/OnBindListener.java delete mode 100644 src/main/java/de/pixart/messenger/xmpp/OnIqPacketReceived.java delete mode 100644 src/main/java/de/pixart/messenger/xmpp/jingle/OnJinglePacketReceived.java delete mode 100644 src/main/java/de/pixart/messenger/xmpp/jingle/Transport.java rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/Config.java (99%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/android/AbstractPhoneContact.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/android/JabberIdContact.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/DomainHostnameVerifier.java (84%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/OmemoSetting.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/OtrService.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/PgpDecryptionService.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/PgpEngine.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/XmppDomainVerifier.java (99%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/axolotl/AxolotlService.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/axolotl/BrokenSessionException.java (90%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/axolotl/CryptoFailedException.java (86%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/axolotl/FingerprintStatus.java (99%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/axolotl/NoSessionsCreatedException.java (57%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/axolotl/NotEncryptedForThisDeviceException.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/axolotl/OnMessageCreatedCallback.java (65%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/axolotl/OutdatedSenderException.java (76%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/axolotl/SQLiteAxolotlStore.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/axolotl/XmppAxolotlMessage.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/axolotl/XmppAxolotlSession.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/sasl/Anonymous.java (76%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/sasl/DigestMd5.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/sasl/External.java (80%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/sasl/Plain.java (84%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/sasl/SaslMechanism.java (93%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/sasl/ScramMechanism.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/sasl/ScramSha1.java (80%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/sasl/ScramSha256.java (81%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/crypto/sasl/Tokenizer.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/AbstractEntity.java (90%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/Account.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/Blockable.java (82%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/Bookmark.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/Contact.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/Conversation.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/Conversational.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/DownloadableFile.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/Edit.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/IndividualMessage.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/ListItem.java (92%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/MTMDecision.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/Message.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/MucOptions.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/Presence.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/PresenceTemplate.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/Presences.java (99%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/RawBlockable.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/ReadByMarker.java (99%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/ReceiptRequest.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/Room.java (92%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/Roster.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/ServiceDiscoveryResult.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/StubConversation.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/Transferable.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/entities/TransferablePlaceholder.java (92%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/generator/AbstractGenerator.java (90%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/generator/IqGenerator.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/generator/MessageGenerator.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/generator/PresenceGenerator.java (87%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/http/AesGcmURLStreamHandler.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/http/CustomURLStreamHandlerFactory.java (93%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/http/HttpConnectionManager.java (92%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/http/HttpDownloadConnection.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/http/HttpUploadConnection.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/http/Method.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/http/NoSSLv3SocketFactory.java (99%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/http/P1S3UrlStreamHandler.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/http/SlotRequester.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/http/services/MuclumbusService.java (90%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/parser/AbstractParser.java (92%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/parser/IqParser.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/parser/MessageParser.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/parser/PresenceParser.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/persistance/DatabaseBackend.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/persistance/FileBackend.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/persistance/OnPhoneContactsMerged.java (63%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/services/AbstractConnectionManager.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/services/AbstractQuickConversationsService.java (93%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/services/AlarmReceiver.java (84%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/services/AttachFileToConversationRunnable.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/services/AudioPlayer.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/services/AvatarService.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/services/BarcodeProvider.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/services/ChannelDiscoveryService.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/services/ContactChooserTargetService.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/services/EventReceiver.java (91%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/services/ExportBackupService.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/services/ImportBackupService.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/services/MediaPlayer.java (88%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/services/MemorizingTrustManager.java (99%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/services/MessageArchiveService.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/services/MessageSearchTask.java (91%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/services/NotificationService.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/services/QuickConversationsService.java (92%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/services/ShortcutService.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/services/UpdateService.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/services/XmppConnectionService.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/AboutActivity.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/AboutPreference.java (87%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/AbstractSearchableListItemActivity.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/ActionBarActivity.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/BlockContactDialog.java (91%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/BlocklistActivity.java (90%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/ChangePasswordActivity.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/ChannelDiscoveryActivity.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/ChooseAccountForProfilePictureActivity.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/ChooseContactActivity.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/ConferenceDetailsActivity.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/ContactDetailsActivity.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/ConversationFragment.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/ConversationsActivity.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/ConversationsOverviewFragment.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/CreatePrivateGroupChatDialog.java (93%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/CreatePublicChannelDialog.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/EditAccountActivity.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/EnterJidDialog.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/EnterNameActivity.java (92%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/ImportBackupActivity.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/IntroActivity.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/JoinConferenceDialog.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/LocationActivity.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/MagicCreateActivity.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/ManageAccountActivity.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/MediaBrowserActivity.java (92%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/MediaViewerActivity.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/MemorizingActivity.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/MucUsersActivity.java (91%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/OmemoActivity.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/PublishGroupChatProfilePictureActivity.java (92%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/PublishProfilePictureActivity.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/RecordingActivity.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/ScanActivity.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/SearchActivity.java (90%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/SetSettingsActivity.java (88%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/SettingsActivity.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/SettingsFragment.java (93%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/ShareLocationActivity.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/ShareViaAccountActivity.java (92%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/ShareWithActivity.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/ShortcutActivity.java (92%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/ShowLocationActivity.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/StartConversationActivity.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/TimePreference.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/TrustKeysActivity.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/UiCallback.java (84%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/UiInformableCallback.java (72%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/UpdaterActivity.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/UriHandlerActivity.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/VerifyOTRActivity.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/WelcomeActivity.java (92%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/XmppActivity.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/XmppFragment.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/adapter/AccountAdapter.java (90%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/adapter/BackupFileAdapter.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/adapter/ChannelSearchResultAdapter.java (92%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/adapter/ConversationAdapter.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/adapter/KnownHostsAdapter.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/adapter/ListItemAdapter.java (92%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/adapter/MediaAdapter.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/adapter/MediaPreviewAdapter.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/adapter/MessageAdapter.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/adapter/PresenceTemplateAdapter.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/adapter/UserAdapter.java (90%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/adapter/UserPreviewAdapter.java (85%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/forms/FormBooleanFieldWrapper.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/forms/FormFieldFactory.java (90%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/forms/FormFieldWrapper.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/forms/FormJidSingleFieldWrapper.java (90%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/forms/FormTextFieldWrapper.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/forms/FormWrapper.java (93%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/interfaces/OnAvatarPublication.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/interfaces/OnBackendConnected.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/interfaces/OnConversationArchived.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/interfaces/OnConversationRead.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/interfaces/OnConversationSelected.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/interfaces/OnConversationsListItemUpdated.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/interfaces/OnMediaLoaded.java (54%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/interfaces/OnSearchResultsAvailable.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/service/CameraManager.java (99%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/text/DividerSpan.java (93%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/text/FixedURLSpan.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/text/QuoteSpan.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/ActivityResult.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/Attachment.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/AvatarWorkerTask.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/ChangeWatcher.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/ConversationMenuConfigurator.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/DateSeparator.java (91%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/DelayedHintHelper.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/EditMessageActionModeCallback.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/GridManager.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/IntroHelper.java (84%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/JidDialog.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/ListViewUtils.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/MucConfiguration.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/MucDetailsContextMenuHelper.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/MyLinkify.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/PendingActionHelper.java (92%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/PendingItem.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/PresenceSelector.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/ScrollState.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/SendButtonAction.java (85%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/SendButtonTool.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/ShareUtil.java (93%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/SoftKeyboardUtils.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/StyledAttributes.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/util/ViewUtil.java (91%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/widget/ClickableMovementMethod.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/widget/CopyTextView.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/widget/DisabledActionModeCallback.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/widget/EditMessage.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/widget/FailedCountCustomView.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/widget/ImmediateAutoCompleteTextView.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/widget/ListSelectionManager.java (99%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/widget/RichLinkView.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/widget/ScannerView.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/widget/SquareFrameLayout.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/widget/TextInputEditText.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/ui/widget/UnreadCountCustomView.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/AccountUtils.java (88%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/AndroidUsingExecLowPriority.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/AndroidUsingLinkProperties.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/BackupFileHeader.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/Cancellable.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/CharSequenceUtils.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/Checksum.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/Compatibility.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/ConversationsFileObserver.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/CryptoHelper.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/CursorUtils.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/EmojiWrapper.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/Emoticons.java (99%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/EncryptDecryptFile.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/ExceptionHandler.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/ExceptionHelper.java (93%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/ExifHelper.java (99%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/FileUtils.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/FileWriterException.java (59%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/FirstStartManager.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/FtsUtils.java (99%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/GeoHelper.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/IP.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/ImStyleParser.java (99%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/IrregularUnicodeDetector.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/JidHelper.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/LanguageUtils.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/LocationHelper.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/MenuDoubleTabUtil.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/MessageUtils.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/MetaData.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/MimeUtils.java (99%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/Namespace.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/NickValidityChecker.java (91%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/OnPhoneContactsLoadedListener.java (81%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/PRNGFixes.java (99%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/Patterns.java (99%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/PermissionUtils.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/PhoneHelper.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/QuickLoader.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/ReplacingSerialSingleThreadExecutor.java (93%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/ReplacingTaskManager.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/Resolver.java (99%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/RichPreview.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/SSLSocketHelper.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/SerialSingleThreadExecutor.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/SignupUtils.java (81%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/SocksSocketFactory.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/StringUtils.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/StylingHelper.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/TLSSocketFactory.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/ThemeHelper.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/TimeframeUtils.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/TorServiceUtils.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/UIHelper.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/WakeLockHelper.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/WeakReferenceSet.java (94%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/XEP0392Helper.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/XmlHelper.java (91%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/utils/XmppUri.java (99%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xml/Element.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xml/LocalizedContent.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xml/Tag.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xml/TagWriter.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xml/XmlElementReader.java (93%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xml/XmlReader.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/InvalidJid.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/OnAdvancedStreamFeaturesLoaded.java (60%) create mode 100644 src/main/java/eu/siacs/conversations/xmpp/OnBindListener.java rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/OnContactStatusChanged.java (60%) create mode 100644 src/main/java/eu/siacs/conversations/xmpp/OnIqPacketReceived.java rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/OnKeyStatusUpdated.java (53%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/OnMessageAcknowledged.java (55%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/OnMessagePacketReceived.java (51%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/OnNewKeysAvailable.java (100%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/OnPresencePacketReceived.java (51%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/OnStatusChanged.java (51%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/OnUpdateBlocklist.java (91%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/PacketReceived.java (55%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/Patches.java (91%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/XmppConnection.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/chatstate/ChatState.java (91%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/forms/Data.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/forms/Field.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/jid/OtrJidHelper.java (90%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/jingle/DirectConnectionUtils.java (98%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/jingle/JingleCandidate.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/jingle/JingleConnection.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/jingle/JingleConnectionManager.java (92%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/jingle/JingleInBandTransport.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/jingle/JingleSocks5Transport.java (96%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/jingle/JingleTransport.java (81%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/jingle/OnFileTransmissionStatusChanged.java (58%) create mode 100644 src/main/java/eu/siacs/conversations/xmpp/jingle/OnJinglePacketReceived.java rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/jingle/OnPrimaryCandidateFound.java (73%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/jingle/OnTransportConnected.java (69%) create mode 100644 src/main/java/eu/siacs/conversations/xmpp/jingle/Transport.java rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/jingle/stanzas/Content.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/jingle/stanzas/JinglePacket.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/jingle/stanzas/Reason.java (62%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/mam/MamReference.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/pep/Avatar.java (97%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/pep/PublishOptions.java (88%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/stanzas/AbstractAcknowledgeableStanza.java (84%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/stanzas/AbstractStanza.java (90%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/stanzas/IqPacket.java (95%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/stanzas/MessagePacket.java (93%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/stanzas/PresencePacket.java (75%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/stanzas/csi/ActivePacket.java (60%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/stanzas/csi/InactivePacket.java (61%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/stanzas/streammgmt/AckPacket.java (69%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/stanzas/streammgmt/EnablePacket.java (67%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/stanzas/streammgmt/RequestPacket.java (62%) rename src/main/java/{de/pixart/messenger => eu/siacs/conversations}/xmpp/stanzas/streammgmt/ResumePacket.java (73%) rename src/playstore/java/{de/pixart/messenger => eu/siacs/conversations}/services/EmojiService.java (94%) rename src/playstore/java/{de/pixart/messenger => eu/siacs/conversations}/services/MaintenanceReceiver.java (77%) rename src/playstore/java/{de/pixart/messenger => eu/siacs/conversations}/services/PushManagementService.java (94%) rename src/playstore/java/{de/pixart/messenger => eu/siacs/conversations}/services/PushMessageReceiver.java (90%) rename src/playstore/java/{de/pixart/messenger => eu/siacs/conversations}/ui/widget/EmojiWrapperEditText.java (89%) rename src/playstore/java/{de/pixart/messenger => eu/siacs/conversations}/utils/InstallReferrerUtils.java (94%) diff --git a/proguard-rules.pro b/proguard-rules.pro index 0b9282d2e2..f286999abf 100644 --- a/proguard-rules.pro +++ b/proguard-rules.pro @@ -1,6 +1,7 @@ -dontobfuscate -keep class de.pixart.messenger.** +-keep class eu.siacs.conversations.** -keep class org.whispersystems.** -keep class com.kyleduo.switchbutton.Configuration -keep class com.soundcloud.android.crop.** @@ -24,7 +25,7 @@ -dontwarn java.lang.** -dontwarn javax.lang.** --keepclassmembers class de.pixart.messenger.http.services.** { +-keepclassmembers class eu.siacs.conversations.http.services.** { !transient ; } diff --git a/src/git/java/de/pixart/messenger/services/EmojiService.java b/src/git/java/eu/siacs/conversations/services/EmojiService.java similarity index 95% rename from src/git/java/de/pixart/messenger/services/EmojiService.java rename to src/git/java/eu/siacs/conversations/services/EmojiService.java index f76cf5a4b6..e12a0d1a00 100644 --- a/src/git/java/de/pixart/messenger/services/EmojiService.java +++ b/src/git/java/eu/siacs/conversations/services/EmojiService.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; import android.content.Context; import android.os.Build; diff --git a/src/git/java/de/pixart/messenger/services/PushManagementService.java b/src/git/java/eu/siacs/conversations/services/PushManagementService.java similarity index 85% rename from src/git/java/de/pixart/messenger/services/PushManagementService.java rename to src/git/java/eu/siacs/conversations/services/PushManagementService.java index 9d4673fd3e..4ac991dbf4 100644 --- a/src/git/java/de/pixart/messenger/services/PushManagementService.java +++ b/src/git/java/eu/siacs/conversations/services/PushManagementService.java @@ -1,7 +1,7 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Conversation; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Conversation; public class PushManagementService { diff --git a/src/git/java/de/pixart/messenger/ui/widget/EmojiWrapperEditText.java b/src/git/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java similarity index 89% rename from src/git/java/de/pixart/messenger/ui/widget/EmojiWrapperEditText.java rename to src/git/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java index 3e8e4976bb..01905e3767 100644 --- a/src/git/java/de/pixart/messenger/ui/widget/EmojiWrapperEditText.java +++ b/src/git/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.widget; +package eu.siacs.conversations.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/src/git/java/de/pixart/messenger/utils/InstallReferrerUtils.java b/src/git/java/eu/siacs/conversations/utils/InstallReferrerUtils.java similarity index 59% rename from src/git/java/de/pixart/messenger/utils/InstallReferrerUtils.java rename to src/git/java/eu/siacs/conversations/utils/InstallReferrerUtils.java index cd0378828d..325caa8d0b 100644 --- a/src/git/java/de/pixart/messenger/utils/InstallReferrerUtils.java +++ b/src/git/java/eu/siacs/conversations/utils/InstallReferrerUtils.java @@ -1,7 +1,7 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; -import de.pixart.messenger.ui.MagicCreateActivity; -import de.pixart.messenger.ui.WelcomeActivity; +import eu.siacs.conversations.ui.MagicCreateActivity; +import eu.siacs.conversations.ui.WelcomeActivity; public class InstallReferrerUtils { diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 791def9536..b95544af01 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="eu.siacs.conversations"> @@ -93,7 +93,7 @@ { private final SessionCipher cipher; diff --git a/src/main/java/de/pixart/messenger/crypto/sasl/Anonymous.java b/src/main/java/eu/siacs/conversations/crypto/sasl/Anonymous.java similarity index 76% rename from src/main/java/de/pixart/messenger/crypto/sasl/Anonymous.java rename to src/main/java/eu/siacs/conversations/crypto/sasl/Anonymous.java index 93c3de64b1..73cb7411fd 100644 --- a/src/main/java/de/pixart/messenger/crypto/sasl/Anonymous.java +++ b/src/main/java/eu/siacs/conversations/crypto/sasl/Anonymous.java @@ -1,9 +1,9 @@ -package de.pixart.messenger.crypto.sasl; +package eu.siacs.conversations.crypto.sasl; import java.security.SecureRandom; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.xml.TagWriter; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.xml.TagWriter; public class Anonymous extends SaslMechanism { diff --git a/src/main/java/de/pixart/messenger/crypto/sasl/DigestMd5.java b/src/main/java/eu/siacs/conversations/crypto/sasl/DigestMd5.java similarity index 95% rename from src/main/java/de/pixart/messenger/crypto/sasl/DigestMd5.java rename to src/main/java/eu/siacs/conversations/crypto/sasl/DigestMd5.java index 2e6c43edc1..6550fbbc11 100644 --- a/src/main/java/de/pixart/messenger/crypto/sasl/DigestMd5.java +++ b/src/main/java/eu/siacs/conversations/crypto/sasl/DigestMd5.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.crypto.sasl; +package eu.siacs.conversations.crypto.sasl; import android.util.Base64; @@ -7,9 +7,9 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.utils.CryptoHelper; -import de.pixart.messenger.xml.TagWriter; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.xml.TagWriter; public class DigestMd5 extends SaslMechanism { public DigestMd5(final TagWriter tagWriter, final Account account, final SecureRandom rng) { diff --git a/src/main/java/de/pixart/messenger/crypto/sasl/External.java b/src/main/java/eu/siacs/conversations/crypto/sasl/External.java similarity index 80% rename from src/main/java/de/pixart/messenger/crypto/sasl/External.java rename to src/main/java/eu/siacs/conversations/crypto/sasl/External.java index e1b21e59ea..441e8b5c78 100644 --- a/src/main/java/de/pixart/messenger/crypto/sasl/External.java +++ b/src/main/java/eu/siacs/conversations/crypto/sasl/External.java @@ -1,11 +1,11 @@ -package de.pixart.messenger.crypto.sasl; +package eu.siacs.conversations.crypto.sasl; import android.util.Base64; import java.security.SecureRandom; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.xml.TagWriter; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.xml.TagWriter; public class External extends SaslMechanism { diff --git a/src/main/java/de/pixart/messenger/crypto/sasl/Plain.java b/src/main/java/eu/siacs/conversations/crypto/sasl/Plain.java similarity index 84% rename from src/main/java/de/pixart/messenger/crypto/sasl/Plain.java rename to src/main/java/eu/siacs/conversations/crypto/sasl/Plain.java index e7e497d37d..1cec6664a3 100644 --- a/src/main/java/de/pixart/messenger/crypto/sasl/Plain.java +++ b/src/main/java/eu/siacs/conversations/crypto/sasl/Plain.java @@ -1,11 +1,11 @@ -package de.pixart.messenger.crypto.sasl; +package eu.siacs.conversations.crypto.sasl; import android.util.Base64; import java.nio.charset.Charset; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.xml.TagWriter; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.xml.TagWriter; public class Plain extends SaslMechanism { public Plain(final TagWriter tagWriter, final Account account) { diff --git a/src/main/java/de/pixart/messenger/crypto/sasl/SaslMechanism.java b/src/main/java/eu/siacs/conversations/crypto/sasl/SaslMechanism.java similarity index 93% rename from src/main/java/de/pixart/messenger/crypto/sasl/SaslMechanism.java rename to src/main/java/eu/siacs/conversations/crypto/sasl/SaslMechanism.java index cce4534557..86fd6524e4 100644 --- a/src/main/java/de/pixart/messenger/crypto/sasl/SaslMechanism.java +++ b/src/main/java/eu/siacs/conversations/crypto/sasl/SaslMechanism.java @@ -1,9 +1,9 @@ -package de.pixart.messenger.crypto.sasl; +package eu.siacs.conversations.crypto.sasl; import java.security.SecureRandom; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.xml.TagWriter; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.xml.TagWriter; public abstract class SaslMechanism { diff --git a/src/main/java/de/pixart/messenger/crypto/sasl/ScramMechanism.java b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramMechanism.java similarity index 98% rename from src/main/java/de/pixart/messenger/crypto/sasl/ScramMechanism.java rename to src/main/java/eu/siacs/conversations/crypto/sasl/ScramMechanism.java index 4a6fa42e58..66fd7602ce 100644 --- a/src/main/java/de/pixart/messenger/crypto/sasl/ScramMechanism.java +++ b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramMechanism.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.crypto.sasl; +package eu.siacs.conversations.crypto.sasl; import android.annotation.TargetApi; @@ -14,9 +14,9 @@ import java.nio.charset.Charset; import java.security.InvalidKeyException; import java.security.SecureRandom; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.utils.CryptoHelper; -import de.pixart.messenger.xml.TagWriter; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.xml.TagWriter; @TargetApi(Build.VERSION_CODES.HONEYCOMB_MR1) abstract class ScramMechanism extends SaslMechanism { diff --git a/src/main/java/de/pixart/messenger/crypto/sasl/ScramSha1.java b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java similarity index 80% rename from src/main/java/de/pixart/messenger/crypto/sasl/ScramSha1.java rename to src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java index c613385363..48de64462f 100644 --- a/src/main/java/de/pixart/messenger/crypto/sasl/ScramSha1.java +++ b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java @@ -1,12 +1,12 @@ -package de.pixart.messenger.crypto.sasl; +package eu.siacs.conversations.crypto.sasl; import org.bouncycastle.crypto.digests.SHA1Digest; import org.bouncycastle.crypto.macs.HMac; import java.security.SecureRandom; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.xml.TagWriter; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.xml.TagWriter; public class ScramSha1 extends ScramMechanism { static { diff --git a/src/main/java/de/pixart/messenger/crypto/sasl/ScramSha256.java b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha256.java similarity index 81% rename from src/main/java/de/pixart/messenger/crypto/sasl/ScramSha256.java rename to src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha256.java index b47884f554..819b3ffc0f 100644 --- a/src/main/java/de/pixart/messenger/crypto/sasl/ScramSha256.java +++ b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha256.java @@ -1,12 +1,12 @@ -package de.pixart.messenger.crypto.sasl; +package eu.siacs.conversations.crypto.sasl; import org.bouncycastle.crypto.digests.SHA256Digest; import org.bouncycastle.crypto.macs.HMac; import java.security.SecureRandom; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.xml.TagWriter; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.xml.TagWriter; public class ScramSha256 extends ScramMechanism { static { diff --git a/src/main/java/de/pixart/messenger/crypto/sasl/Tokenizer.java b/src/main/java/eu/siacs/conversations/crypto/sasl/Tokenizer.java similarity index 98% rename from src/main/java/de/pixart/messenger/crypto/sasl/Tokenizer.java rename to src/main/java/eu/siacs/conversations/crypto/sasl/Tokenizer.java index 67e4418dd9..f9ba24f094 100644 --- a/src/main/java/de/pixart/messenger/crypto/sasl/Tokenizer.java +++ b/src/main/java/eu/siacs/conversations/crypto/sasl/Tokenizer.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.crypto.sasl; +package eu.siacs.conversations.crypto.sasl; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/de/pixart/messenger/entities/AbstractEntity.java b/src/main/java/eu/siacs/conversations/entities/AbstractEntity.java similarity index 90% rename from src/main/java/de/pixart/messenger/entities/AbstractEntity.java rename to src/main/java/eu/siacs/conversations/entities/AbstractEntity.java index 2cac3405e4..a80712b559 100644 --- a/src/main/java/de/pixart/messenger/entities/AbstractEntity.java +++ b/src/main/java/eu/siacs/conversations/entities/AbstractEntity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; import android.content.ContentValues; diff --git a/src/main/java/de/pixart/messenger/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java similarity index 97% rename from src/main/java/de/pixart/messenger/entities/Account.java rename to src/main/java/eu/siacs/conversations/entities/Account.java index 154f98af99..8a3a12bc97 100644 --- a/src/main/java/de/pixart/messenger/entities/Account.java +++ b/src/main/java/eu/siacs/conversations/entities/Account.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; import android.content.ContentValues; import android.database.Cursor; @@ -24,17 +24,17 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.crypto.OtrService; -import de.pixart.messenger.crypto.PgpDecryptionService; -import de.pixart.messenger.crypto.axolotl.AxolotlService; -import de.pixart.messenger.crypto.axolotl.XmppAxolotlSession; -import de.pixart.messenger.services.AvatarService; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.utils.UIHelper; -import de.pixart.messenger.utils.XmppUri; -import de.pixart.messenger.xmpp.XmppConnection; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.crypto.OtrService; +import eu.siacs.conversations.crypto.PgpDecryptionService; +import eu.siacs.conversations.crypto.axolotl.AxolotlService; +import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession; +import eu.siacs.conversations.services.AvatarService; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.utils.UIHelper; +import eu.siacs.conversations.utils.XmppUri; +import eu.siacs.conversations.xmpp.XmppConnection; import rocks.xmpp.addr.Jid; public class Account extends AbstractEntity implements AvatarService.Avatarable { diff --git a/src/main/java/de/pixart/messenger/entities/Blockable.java b/src/main/java/eu/siacs/conversations/entities/Blockable.java similarity index 82% rename from src/main/java/de/pixart/messenger/entities/Blockable.java rename to src/main/java/eu/siacs/conversations/entities/Blockable.java index e735b4a735..c43985415c 100644 --- a/src/main/java/de/pixart/messenger/entities/Blockable.java +++ b/src/main/java/eu/siacs/conversations/entities/Blockable.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; import rocks.xmpp.addr.Jid; diff --git a/src/main/java/de/pixart/messenger/entities/Bookmark.java b/src/main/java/eu/siacs/conversations/entities/Bookmark.java similarity index 96% rename from src/main/java/de/pixart/messenger/entities/Bookmark.java rename to src/main/java/eu/siacs/conversations/entities/Bookmark.java index a5fa6fb359..15f1b03138 100644 --- a/src/main/java/de/pixart/messenger/entities/Bookmark.java +++ b/src/main/java/eu/siacs/conversations/entities/Bookmark.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; import android.content.Context; @@ -13,11 +13,11 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import de.pixart.messenger.utils.Namespace; -import de.pixart.messenger.utils.StringUtils; -import de.pixart.messenger.utils.UIHelper; -import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xmpp.InvalidJid; +import eu.siacs.conversations.utils.Namespace; +import eu.siacs.conversations.utils.StringUtils; +import eu.siacs.conversations.utils.UIHelper; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.InvalidJid; import rocks.xmpp.addr.Jid; public class Bookmark extends Element implements ListItem { diff --git a/src/main/java/de/pixart/messenger/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java similarity index 97% rename from src/main/java/de/pixart/messenger/entities/Contact.java rename to src/main/java/eu/siacs/conversations/entities/Contact.java index 57a6642418..ac916288d2 100644 --- a/src/main/java/de/pixart/messenger/entities/Contact.java +++ b/src/main/java/eu/siacs/conversations/entities/Contact.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; import android.content.ContentValues; import android.content.Context; @@ -18,14 +18,14 @@ import java.util.HashSet; import java.util.List; import java.util.Locale; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.android.AbstractPhoneContact; -import de.pixart.messenger.services.QuickConversationsService; -import de.pixart.messenger.utils.JidHelper; -import de.pixart.messenger.utils.UIHelper; -import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xmpp.pep.Avatar; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.android.AbstractPhoneContact; +import eu.siacs.conversations.services.QuickConversationsService; +import eu.siacs.conversations.utils.JidHelper; +import eu.siacs.conversations.utils.UIHelper; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.pep.Avatar; import rocks.xmpp.addr.Jid; public class Contact implements ListItem, Blockable { diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java similarity index 98% rename from src/main/java/de/pixart/messenger/entities/Conversation.java rename to src/main/java/eu/siacs/conversations/entities/Conversation.java index 0635a4553e..062a56adcf 100644 --- a/src/main/java/de/pixart/messenger/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; import android.content.ContentValues; import android.database.Cursor; @@ -26,19 +26,19 @@ import java.util.ListIterator; import java.util.Locale; import java.util.concurrent.atomic.AtomicBoolean; -import de.pixart.messenger.Config; -import de.pixart.messenger.crypto.OmemoSetting; -import de.pixart.messenger.crypto.PgpDecryptionService; -import de.pixart.messenger.persistance.DatabaseBackend; -import de.pixart.messenger.services.AvatarService; -import de.pixart.messenger.services.QuickConversationsService; -import de.pixart.messenger.utils.JidHelper; -import de.pixart.messenger.utils.UIHelper; -import de.pixart.messenger.xmpp.chatstate.ChatState; -import de.pixart.messenger.xmpp.mam.MamReference; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.crypto.OmemoSetting; +import eu.siacs.conversations.crypto.PgpDecryptionService; +import eu.siacs.conversations.persistance.DatabaseBackend; +import eu.siacs.conversations.services.AvatarService; +import eu.siacs.conversations.services.QuickConversationsService; +import eu.siacs.conversations.utils.JidHelper; +import eu.siacs.conversations.utils.UIHelper; +import eu.siacs.conversations.xmpp.chatstate.ChatState; +import eu.siacs.conversations.xmpp.mam.MamReference; import rocks.xmpp.addr.Jid; -import static de.pixart.messenger.entities.Bookmark.printableValue; +import static eu.siacs.conversations.entities.Bookmark.printableValue; public class Conversation extends AbstractEntity implements Blockable, Comparable, Conversational, AvatarService.Avatarable { diff --git a/src/main/java/de/pixart/messenger/entities/Conversational.java b/src/main/java/eu/siacs/conversations/entities/Conversational.java similarity index 97% rename from src/main/java/de/pixart/messenger/entities/Conversational.java rename to src/main/java/eu/siacs/conversations/entities/Conversational.java index 27482e1952..0194ebf7e9 100644 --- a/src/main/java/de/pixart/messenger/entities/Conversational.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversational.java @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; import rocks.xmpp.addr.Jid; diff --git a/src/main/java/de/pixart/messenger/entities/DownloadableFile.java b/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java similarity index 95% rename from src/main/java/de/pixart/messenger/entities/DownloadableFile.java rename to src/main/java/eu/siacs/conversations/entities/DownloadableFile.java index 1209d16eb5..06f307dbb9 100644 --- a/src/main/java/de/pixart/messenger/entities/DownloadableFile.java +++ b/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java @@ -1,11 +1,11 @@ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; import android.util.Log; import java.io.File; -import de.pixart.messenger.Config; -import de.pixart.messenger.utils.MimeUtils; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.utils.MimeUtils; public class DownloadableFile extends File { diff --git a/src/main/java/de/pixart/messenger/entities/Edit.java b/src/main/java/eu/siacs/conversations/entities/Edit.java similarity index 98% rename from src/main/java/de/pixart/messenger/entities/Edit.java rename to src/main/java/eu/siacs/conversations/entities/Edit.java index ab96949a0a..79ef1fbaa2 100644 --- a/src/main/java/de/pixart/messenger/entities/Edit.java +++ b/src/main/java/eu/siacs/conversations/entities/Edit.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; import org.json.JSONArray; import org.json.JSONException; diff --git a/src/main/java/de/pixart/messenger/entities/IndividualMessage.java b/src/main/java/eu/siacs/conversations/entities/IndividualMessage.java similarity index 98% rename from src/main/java/de/pixart/messenger/entities/IndividualMessage.java rename to src/main/java/eu/siacs/conversations/entities/IndividualMessage.java index 3daa279643..63b6ea7190 100644 --- a/src/main/java/de/pixart/messenger/entities/IndividualMessage.java +++ b/src/main/java/eu/siacs/conversations/entities/IndividualMessage.java @@ -26,13 +26,13 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; import android.database.Cursor; import java.util.Set; -import de.pixart.messenger.ui.adapter.MessageAdapter; +import eu.siacs.conversations.ui.adapter.MessageAdapter; import rocks.xmpp.addr.Jid; public class IndividualMessage extends Message { diff --git a/src/main/java/de/pixart/messenger/entities/ListItem.java b/src/main/java/eu/siacs/conversations/entities/ListItem.java similarity index 92% rename from src/main/java/de/pixart/messenger/entities/ListItem.java rename to src/main/java/eu/siacs/conversations/entities/ListItem.java index e8907b588a..009c16a055 100644 --- a/src/main/java/de/pixart/messenger/entities/ListItem.java +++ b/src/main/java/eu/siacs/conversations/entities/ListItem.java @@ -1,10 +1,10 @@ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; import android.content.Context; import java.util.List; -import de.pixart.messenger.services.AvatarService; +import eu.siacs.conversations.services.AvatarService; import rocks.xmpp.addr.Jid; public interface ListItem extends Comparable, AvatarService.Avatarable { diff --git a/src/main/java/de/pixart/messenger/entities/MTMDecision.java b/src/main/java/eu/siacs/conversations/entities/MTMDecision.java similarity index 97% rename from src/main/java/de/pixart/messenger/entities/MTMDecision.java rename to src/main/java/eu/siacs/conversations/entities/MTMDecision.java index 38cc4b5785..fe939c0ae1 100644 --- a/src/main/java/de/pixart/messenger/entities/MTMDecision.java +++ b/src/main/java/eu/siacs/conversations/entities/MTMDecision.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; public class MTMDecision { public final static int DECISION_INVALID = 0; diff --git a/src/main/java/de/pixart/messenger/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java similarity index 97% rename from src/main/java/de/pixart/messenger/entities/Message.java rename to src/main/java/eu/siacs/conversations/entities/Message.java index 21ab339752..72078d65d6 100644 --- a/src/main/java/de/pixart/messenger/entities/Message.java +++ b/src/main/java/eu/siacs/conversations/entities/Message.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; import android.content.ContentValues; import android.database.Cursor; @@ -18,17 +18,17 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import de.pixart.messenger.Config; -import de.pixart.messenger.crypto.axolotl.FingerprintStatus; -import de.pixart.messenger.services.AvatarService; -import de.pixart.messenger.utils.CryptoHelper; -import de.pixart.messenger.utils.Emoticons; -import de.pixart.messenger.utils.GeoHelper; -import de.pixart.messenger.utils.MessageUtils; -import de.pixart.messenger.utils.MimeUtils; -import de.pixart.messenger.utils.Patterns; -import de.pixart.messenger.utils.UIHelper; -import de.pixart.messenger.utils.XmppUri; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.crypto.axolotl.FingerprintStatus; +import eu.siacs.conversations.services.AvatarService; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.utils.Emoticons; +import eu.siacs.conversations.utils.GeoHelper; +import eu.siacs.conversations.utils.MessageUtils; +import eu.siacs.conversations.utils.MimeUtils; +import eu.siacs.conversations.utils.Patterns; +import eu.siacs.conversations.utils.UIHelper; +import eu.siacs.conversations.utils.XmppUri; import rocks.xmpp.addr.Jid; public class Message extends AbstractEntity implements AvatarService.Avatarable { @@ -83,8 +83,8 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable public static final String MARKABLE = "markable"; public static final String FILE_DELETED = "file_deleted"; public static final String ME_COMMAND = "/me"; - public static final String ERROR_MESSAGE_CANCELLED = "de.pixart.messenger.cancelled"; - public static final String DELETED_MESSAGE_BODY = "de.pixart.messenger.message_deleted"; + public static final String ERROR_MESSAGE_CANCELLED = "eu.siacs.conversations.cancelled"; + public static final String DELETED_MESSAGE_BODY = "eu.siacs.conversations.message_deleted"; public boolean markable = false; protected String conversationUuid; diff --git a/src/main/java/de/pixart/messenger/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java similarity index 98% rename from src/main/java/de/pixart/messenger/entities/MucOptions.java rename to src/main/java/eu/siacs/conversations/entities/MucOptions.java index c4e7114001..bb5b3600c0 100644 --- a/src/main/java/de/pixart/messenger/entities/MucOptions.java +++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; import android.annotation.SuppressLint; import android.text.TextUtils; @@ -13,17 +13,17 @@ import java.util.List; import java.util.Locale; import java.util.Set; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.services.AvatarService; -import de.pixart.messenger.services.MessageArchiveService; -import de.pixart.messenger.utils.JidHelper; -import de.pixart.messenger.utils.Namespace; -import de.pixart.messenger.utils.UIHelper; -import de.pixart.messenger.xmpp.chatstate.ChatState; -import de.pixart.messenger.xmpp.forms.Data; -import de.pixart.messenger.xmpp.forms.Field; -import de.pixart.messenger.xmpp.pep.Avatar; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.services.AvatarService; +import eu.siacs.conversations.services.MessageArchiveService; +import eu.siacs.conversations.utils.JidHelper; +import eu.siacs.conversations.utils.Namespace; +import eu.siacs.conversations.utils.UIHelper; +import eu.siacs.conversations.xmpp.chatstate.ChatState; +import eu.siacs.conversations.xmpp.forms.Data; +import eu.siacs.conversations.xmpp.forms.Field; +import eu.siacs.conversations.xmpp.pep.Avatar; import rocks.xmpp.addr.Jid; @SuppressLint("DefaultLocale") diff --git a/src/main/java/de/pixart/messenger/entities/Presence.java b/src/main/java/eu/siacs/conversations/entities/Presence.java similarity index 96% rename from src/main/java/de/pixart/messenger/entities/Presence.java rename to src/main/java/eu/siacs/conversations/entities/Presence.java index 01d442a2bd..e44e7f23b9 100644 --- a/src/main/java/de/pixart/messenger/entities/Presence.java +++ b/src/main/java/eu/siacs/conversations/entities/Presence.java @@ -1,10 +1,10 @@ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; import androidx.annotation.NonNull; import java.util.Locale; -import de.pixart.messenger.xml.Element; +import eu.siacs.conversations.xml.Element; public class Presence implements Comparable { diff --git a/src/main/java/de/pixart/messenger/entities/PresenceTemplate.java b/src/main/java/eu/siacs/conversations/entities/PresenceTemplate.java similarity index 98% rename from src/main/java/de/pixart/messenger/entities/PresenceTemplate.java rename to src/main/java/eu/siacs/conversations/entities/PresenceTemplate.java index 1a210eda85..98ea2cf664 100644 --- a/src/main/java/de/pixart/messenger/entities/PresenceTemplate.java +++ b/src/main/java/eu/siacs/conversations/entities/PresenceTemplate.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; import android.content.ContentValues; import android.database.Cursor; diff --git a/src/main/java/de/pixart/messenger/entities/Presences.java b/src/main/java/eu/siacs/conversations/entities/Presences.java similarity index 99% rename from src/main/java/de/pixart/messenger/entities/Presences.java rename to src/main/java/eu/siacs/conversations/entities/Presences.java index 273a754e1e..7cce6ff42d 100644 --- a/src/main/java/de/pixart/messenger/entities/Presences.java +++ b/src/main/java/eu/siacs/conversations/entities/Presences.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; import android.util.Pair; diff --git a/src/main/java/de/pixart/messenger/entities/RawBlockable.java b/src/main/java/eu/siacs/conversations/entities/RawBlockable.java similarity index 95% rename from src/main/java/de/pixart/messenger/entities/RawBlockable.java rename to src/main/java/eu/siacs/conversations/entities/RawBlockable.java index 0c8befc064..241e900ab3 100644 --- a/src/main/java/de/pixart/messenger/entities/RawBlockable.java +++ b/src/main/java/eu/siacs/conversations/entities/RawBlockable.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; import android.content.Context; import android.text.TextUtils; @@ -7,7 +7,7 @@ import java.util.Collections; import java.util.List; import java.util.Locale; -import de.pixart.messenger.utils.UIHelper; +import eu.siacs.conversations.utils.UIHelper; import rocks.xmpp.addr.Jid; public class RawBlockable implements ListItem, Blockable { diff --git a/src/main/java/de/pixart/messenger/entities/ReadByMarker.java b/src/main/java/eu/siacs/conversations/entities/ReadByMarker.java similarity index 99% rename from src/main/java/de/pixart/messenger/entities/ReadByMarker.java rename to src/main/java/eu/siacs/conversations/entities/ReadByMarker.java index 113c418ba9..3e01107672 100644 --- a/src/main/java/de/pixart/messenger/entities/ReadByMarker.java +++ b/src/main/java/eu/siacs/conversations/entities/ReadByMarker.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; import org.json.JSONArray; import org.json.JSONException; diff --git a/src/main/java/de/pixart/messenger/entities/ReceiptRequest.java b/src/main/java/eu/siacs/conversations/entities/ReceiptRequest.java similarity index 98% rename from src/main/java/de/pixart/messenger/entities/ReceiptRequest.java rename to src/main/java/eu/siacs/conversations/entities/ReceiptRequest.java index 1b7065d299..a13feb8847 100644 --- a/src/main/java/de/pixart/messenger/entities/ReceiptRequest.java +++ b/src/main/java/eu/siacs/conversations/entities/ReceiptRequest.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; import rocks.xmpp.addr.Jid; diff --git a/src/main/java/de/pixart/messenger/entities/Room.java b/src/main/java/eu/siacs/conversations/entities/Room.java similarity index 92% rename from src/main/java/de/pixart/messenger/entities/Room.java rename to src/main/java/eu/siacs/conversations/entities/Room.java index d41cbe2f23..984de9e418 100644 --- a/src/main/java/de/pixart/messenger/entities/Room.java +++ b/src/main/java/eu/siacs/conversations/entities/Room.java @@ -1,12 +1,12 @@ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; import com.google.common.base.Objects; import com.google.common.base.Strings; import com.google.common.collect.ComparisonChain; -import de.pixart.messenger.services.AvatarService; -import de.pixart.messenger.utils.LanguageUtils; -import de.pixart.messenger.utils.UIHelper; +import eu.siacs.conversations.services.AvatarService; +import eu.siacs.conversations.utils.LanguageUtils; +import eu.siacs.conversations.utils.UIHelper; import rocks.xmpp.addr.Jid; public class Room implements AvatarService.Avatarable, Comparable { diff --git a/src/main/java/de/pixart/messenger/entities/Roster.java b/src/main/java/eu/siacs/conversations/entities/Roster.java similarity index 96% rename from src/main/java/de/pixart/messenger/entities/Roster.java rename to src/main/java/eu/siacs/conversations/entities/Roster.java index 13856c0687..54c2152da9 100644 --- a/src/main/java/de/pixart/messenger/entities/Roster.java +++ b/src/main/java/eu/siacs/conversations/entities/Roster.java @@ -1,11 +1,11 @@ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; -import de.pixart.messenger.android.AbstractPhoneContact; +import eu.siacs.conversations.android.AbstractPhoneContact; import rocks.xmpp.addr.Jid; public class Roster { diff --git a/src/main/java/de/pixart/messenger/entities/ServiceDiscoveryResult.java b/src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java similarity index 97% rename from src/main/java/de/pixart/messenger/entities/ServiceDiscoveryResult.java rename to src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java index a152d7311f..b162de259b 100644 --- a/src/main/java/de/pixart/messenger/entities/ServiceDiscoveryResult.java +++ b/src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; import android.content.ContentValues; import android.database.Cursor; @@ -17,11 +17,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import de.pixart.messenger.utils.Namespace; -import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xmpp.forms.Data; -import de.pixart.messenger.xmpp.forms.Field; -import de.pixart.messenger.xmpp.stanzas.IqPacket; +import eu.siacs.conversations.utils.Namespace; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.forms.Data; +import eu.siacs.conversations.xmpp.forms.Field; +import eu.siacs.conversations.xmpp.stanzas.IqPacket; public class ServiceDiscoveryResult { public static final String TABLENAME = "discovery_results"; diff --git a/src/main/java/de/pixart/messenger/entities/StubConversation.java b/src/main/java/eu/siacs/conversations/entities/StubConversation.java similarity index 98% rename from src/main/java/de/pixart/messenger/entities/StubConversation.java rename to src/main/java/eu/siacs/conversations/entities/StubConversation.java index 75f17812e5..da52ec8450 100644 --- a/src/main/java/de/pixart/messenger/entities/StubConversation.java +++ b/src/main/java/eu/siacs/conversations/entities/StubConversation.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; import rocks.xmpp.addr.Jid; diff --git a/src/main/java/de/pixart/messenger/entities/Transferable.java b/src/main/java/eu/siacs/conversations/entities/Transferable.java similarity index 95% rename from src/main/java/de/pixart/messenger/entities/Transferable.java rename to src/main/java/eu/siacs/conversations/entities/Transferable.java index 968563b328..86dae50c8e 100644 --- a/src/main/java/de/pixart/messenger/entities/Transferable.java +++ b/src/main/java/eu/siacs/conversations/entities/Transferable.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/de/pixart/messenger/entities/TransferablePlaceholder.java b/src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java similarity index 92% rename from src/main/java/de/pixart/messenger/entities/TransferablePlaceholder.java rename to src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java index e22984f5a4..0438d87219 100644 --- a/src/main/java/de/pixart/messenger/entities/TransferablePlaceholder.java +++ b/src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.entities; +package eu.siacs.conversations.entities; public class TransferablePlaceholder implements Transferable { diff --git a/src/main/java/de/pixart/messenger/generator/AbstractGenerator.java b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java similarity index 90% rename from src/main/java/de/pixart/messenger/generator/AbstractGenerator.java rename to src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java index e79fce8eac..06dbd9d763 100644 --- a/src/main/java/de/pixart/messenger/generator/AbstractGenerator.java +++ b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.generator; +package eu.siacs.conversations.generator; import android.util.Base64; @@ -12,15 +12,15 @@ import java.util.List; import java.util.Locale; import java.util.TimeZone; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.crypto.axolotl.AxolotlService; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.utils.Namespace; -import de.pixart.messenger.utils.PhoneHelper; -import de.pixart.messenger.xmpp.XmppConnection; -import de.pixart.messenger.xmpp.jingle.stanzas.Content; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.crypto.axolotl.AxolotlService; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.utils.Namespace; +import eu.siacs.conversations.utils.PhoneHelper; +import eu.siacs.conversations.xmpp.XmppConnection; +import eu.siacs.conversations.xmpp.jingle.stanzas.Content; public abstract class AbstractGenerator { private final String[] FEATURES = { diff --git a/src/main/java/de/pixart/messenger/generator/IqGenerator.java b/src/main/java/eu/siacs/conversations/generator/IqGenerator.java similarity index 97% rename from src/main/java/de/pixart/messenger/generator/IqGenerator.java rename to src/main/java/eu/siacs/conversations/generator/IqGenerator.java index 30363080c9..26c8f0c1f4 100644 --- a/src/main/java/de/pixart/messenger/generator/IqGenerator.java +++ b/src/main/java/eu/siacs/conversations/generator/IqGenerator.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.generator; +package eu.siacs.conversations.generator; import android.os.Bundle; @@ -20,20 +20,20 @@ import java.util.Set; import java.util.TimeZone; import java.util.UUID; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.crypto.axolotl.AxolotlService; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Bookmark; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.DownloadableFile; -import de.pixart.messenger.services.MessageArchiveService; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.utils.Namespace; -import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xmpp.forms.Data; -import de.pixart.messenger.xmpp.pep.Avatar; -import de.pixart.messenger.xmpp.stanzas.IqPacket; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.crypto.axolotl.AxolotlService; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Bookmark; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.DownloadableFile; +import eu.siacs.conversations.services.MessageArchiveService; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.utils.Namespace; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.forms.Data; +import eu.siacs.conversations.xmpp.pep.Avatar; +import eu.siacs.conversations.xmpp.stanzas.IqPacket; import rocks.xmpp.addr.Jid; public class IqGenerator extends AbstractGenerator { diff --git a/src/main/java/de/pixart/messenger/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java similarity index 94% rename from src/main/java/de/pixart/messenger/generator/MessageGenerator.java rename to src/main/java/eu/siacs/conversations/generator/MessageGenerator.java index ae172bd800..208f0262f5 100644 --- a/src/main/java/de/pixart/messenger/generator/MessageGenerator.java +++ b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.generator; +package eu.siacs.conversations.generator; import net.java.otr4j.OtrException; import net.java.otr4j.session.Session; @@ -10,18 +10,18 @@ import java.util.Date; import java.util.Locale; import java.util.TimeZone; -import de.pixart.messenger.Config; -import de.pixart.messenger.crypto.axolotl.AxolotlService; -import de.pixart.messenger.crypto.axolotl.XmppAxolotlMessage; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.http.P1S3UrlStreamHandler; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.utils.Namespace; -import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xmpp.chatstate.ChatState; -import de.pixart.messenger.xmpp.stanzas.MessagePacket; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.crypto.axolotl.AxolotlService; +import eu.siacs.conversations.crypto.axolotl.XmppAxolotlMessage; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.http.P1S3UrlStreamHandler; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.utils.Namespace; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.chatstate.ChatState; +import eu.siacs.conversations.xmpp.stanzas.MessagePacket; import rocks.xmpp.addr.Jid; public class MessageGenerator extends AbstractGenerator { diff --git a/src/main/java/de/pixart/messenger/generator/PresenceGenerator.java b/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java similarity index 87% rename from src/main/java/de/pixart/messenger/generator/PresenceGenerator.java rename to src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java index 02bd5b078d..c979cde416 100644 --- a/src/main/java/de/pixart/messenger/generator/PresenceGenerator.java +++ b/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java @@ -1,15 +1,15 @@ -package de.pixart.messenger.generator; +package eu.siacs.conversations.generator; import android.text.TextUtils; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.MucOptions; -import de.pixart.messenger.entities.Presence; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.utils.Namespace; -import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xmpp.stanzas.PresencePacket; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.MucOptions; +import eu.siacs.conversations.entities.Presence; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.utils.Namespace; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.stanzas.PresencePacket; public class PresenceGenerator extends AbstractGenerator { diff --git a/src/main/java/de/pixart/messenger/http/AesGcmURLStreamHandler.java b/src/main/java/eu/siacs/conversations/http/AesGcmURLStreamHandler.java similarity index 94% rename from src/main/java/de/pixart/messenger/http/AesGcmURLStreamHandler.java rename to src/main/java/eu/siacs/conversations/http/AesGcmURLStreamHandler.java index 4ec1643442..00b5985c28 100644 --- a/src/main/java/de/pixart/messenger/http/AesGcmURLStreamHandler.java +++ b/src/main/java/eu/siacs/conversations/http/AesGcmURLStreamHandler.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.http; +package eu.siacs.conversations.http; import java.io.IOException; import java.net.URL; diff --git a/src/main/java/de/pixart/messenger/http/CustomURLStreamHandlerFactory.java b/src/main/java/eu/siacs/conversations/http/CustomURLStreamHandlerFactory.java similarity index 93% rename from src/main/java/de/pixart/messenger/http/CustomURLStreamHandlerFactory.java rename to src/main/java/eu/siacs/conversations/http/CustomURLStreamHandlerFactory.java index 48bad8f3f3..2cbb7efa46 100644 --- a/src/main/java/de/pixart/messenger/http/CustomURLStreamHandlerFactory.java +++ b/src/main/java/eu/siacs/conversations/http/CustomURLStreamHandlerFactory.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.http; +package eu.siacs.conversations.http; import java.net.URLStreamHandler; import java.net.URLStreamHandlerFactory; diff --git a/src/main/java/de/pixart/messenger/http/HttpConnectionManager.java b/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java similarity index 92% rename from src/main/java/de/pixart/messenger/http/HttpConnectionManager.java rename to src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java index 5d8a342d72..ef13dec52b 100644 --- a/src/main/java/de/pixart/messenger/http/HttpConnectionManager.java +++ b/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.http; +package eu.siacs.conversations.http; import android.util.Log; @@ -19,12 +19,12 @@ import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.X509TrustManager; -import de.pixart.messenger.Config; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.services.AbstractConnectionManager; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.utils.TLSSocketFactory; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.services.AbstractConnectionManager; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.utils.TLSSocketFactory; public class HttpConnectionManager extends AbstractConnectionManager { diff --git a/src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java similarity index 96% rename from src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java rename to src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java index e02c92456d..22257db9d8 100644 --- a/src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java +++ b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.http; +package eu.siacs.conversations.http; import android.os.PowerManager; import android.util.Log; @@ -23,19 +23,19 @@ import java.util.concurrent.CancellationException; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLHandshakeException; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.DownloadableFile; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.entities.Transferable; -import de.pixart.messenger.persistance.FileBackend; -import de.pixart.messenger.services.AbstractConnectionManager; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.utils.CryptoHelper; -import de.pixart.messenger.utils.FileWriterException; -import de.pixart.messenger.utils.WakeLockHelper; -import de.pixart.messenger.xmpp.stanzas.IqPacket; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.DownloadableFile; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.entities.Transferable; +import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.services.AbstractConnectionManager; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.utils.FileWriterException; +import eu.siacs.conversations.utils.WakeLockHelper; +import eu.siacs.conversations.xmpp.stanzas.IqPacket; import rocks.xmpp.addr.Jid; public class HttpDownloadConnection implements Transferable { diff --git a/src/main/java/de/pixart/messenger/http/HttpUploadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java similarity index 94% rename from src/main/java/de/pixart/messenger/http/HttpUploadConnection.java rename to src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java index 2293cb7ea8..cfaa128d11 100644 --- a/src/main/java/de/pixart/messenger/http/HttpUploadConnection.java +++ b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.http; +package eu.siacs.conversations.http; import android.os.PowerManager; import android.util.Log; @@ -15,17 +15,17 @@ import java.util.Scanner; import javax.net.ssl.HttpsURLConnection; -import de.pixart.messenger.Config; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.DownloadableFile; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.entities.Transferable; -import de.pixart.messenger.persistance.FileBackend; -import de.pixart.messenger.services.AbstractConnectionManager; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.utils.Checksum; -import de.pixart.messenger.utils.CryptoHelper; -import de.pixart.messenger.utils.WakeLockHelper; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.DownloadableFile; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.entities.Transferable; +import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.services.AbstractConnectionManager; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.utils.Checksum; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.utils.WakeLockHelper; public class HttpUploadConnection implements Transferable { diff --git a/src/main/java/de/pixart/messenger/http/Method.java b/src/main/java/eu/siacs/conversations/http/Method.java similarity index 94% rename from src/main/java/de/pixart/messenger/http/Method.java rename to src/main/java/eu/siacs/conversations/http/Method.java index d5a1e07a9b..15704a3ef6 100644 --- a/src/main/java/de/pixart/messenger/http/Method.java +++ b/src/main/java/eu/siacs/conversations/http/Method.java @@ -27,10 +27,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.http; +package eu.siacs.conversations.http; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.xmpp.XmppConnection; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.xmpp.XmppConnection; public enum Method { P1_S3, HTTP_UPLOAD, HTTP_UPLOAD_LEGACY; diff --git a/src/main/java/de/pixart/messenger/http/NoSSLv3SocketFactory.java b/src/main/java/eu/siacs/conversations/http/NoSSLv3SocketFactory.java similarity index 99% rename from src/main/java/de/pixart/messenger/http/NoSSLv3SocketFactory.java rename to src/main/java/eu/siacs/conversations/http/NoSSLv3SocketFactory.java index 2a7794c92c..b0f748b008 100644 --- a/src/main/java/de/pixart/messenger/http/NoSSLv3SocketFactory.java +++ b/src/main/java/eu/siacs/conversations/http/NoSSLv3SocketFactory.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.http; +package eu.siacs.conversations.http; /*Copyright 2015 Bhavit Singh Sengar Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/src/main/java/de/pixart/messenger/http/P1S3UrlStreamHandler.java b/src/main/java/eu/siacs/conversations/http/P1S3UrlStreamHandler.java similarity index 96% rename from src/main/java/de/pixart/messenger/http/P1S3UrlStreamHandler.java rename to src/main/java/eu/siacs/conversations/http/P1S3UrlStreamHandler.java index 93b19cd718..9e6c4b7afe 100644 --- a/src/main/java/de/pixart/messenger/http/P1S3UrlStreamHandler.java +++ b/src/main/java/eu/siacs/conversations/http/P1S3UrlStreamHandler.java @@ -27,14 +27,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.http; +package eu.siacs.conversations.http; import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; import java.net.URLStreamHandler; -import de.pixart.messenger.xml.Element; +import eu.siacs.conversations.xml.Element; public class P1S3UrlStreamHandler extends URLStreamHandler { diff --git a/src/main/java/de/pixart/messenger/http/SlotRequester.java b/src/main/java/eu/siacs/conversations/http/SlotRequester.java similarity index 95% rename from src/main/java/de/pixart/messenger/http/SlotRequester.java rename to src/main/java/eu/siacs/conversations/http/SlotRequester.java index 0c3a942e53..7b5f5bd945 100644 --- a/src/main/java/de/pixart/messenger/http/SlotRequester.java +++ b/src/main/java/eu/siacs/conversations/http/SlotRequester.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.http; +package eu.siacs.conversations.http; import android.util.Log; @@ -35,14 +35,14 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.HashMap; -import de.pixart.messenger.Config; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.DownloadableFile; -import de.pixart.messenger.parser.IqParser; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.utils.Namespace; -import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xmpp.stanzas.IqPacket; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.DownloadableFile; +import eu.siacs.conversations.parser.IqParser; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.utils.Namespace; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.stanzas.IqPacket; import rocks.xmpp.addr.Jid; public class SlotRequester { diff --git a/src/main/java/de/pixart/messenger/http/services/MuclumbusService.java b/src/main/java/eu/siacs/conversations/http/services/MuclumbusService.java similarity index 90% rename from src/main/java/de/pixart/messenger/http/services/MuclumbusService.java rename to src/main/java/eu/siacs/conversations/http/services/MuclumbusService.java index fb8a286585..f8d8465e96 100644 --- a/src/main/java/de/pixart/messenger/http/services/MuclumbusService.java +++ b/src/main/java/eu/siacs/conversations/http/services/MuclumbusService.java @@ -1,10 +1,10 @@ -package de.pixart.messenger.http.services; +package eu.siacs.conversations.http.services; import java.util.Collections; import java.util.List; import java.util.Set; -import de.pixart.messenger.entities.Room; +import eu.siacs.conversations.entities.Room; import retrofit2.Call; import retrofit2.http.Body; import retrofit2.http.GET; diff --git a/src/main/java/de/pixart/messenger/parser/AbstractParser.java b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java similarity index 92% rename from src/main/java/de/pixart/messenger/parser/AbstractParser.java rename to src/main/java/eu/siacs/conversations/parser/AbstractParser.java index 0b94102a58..55ebfb1787 100644 --- a/src/main/java/de/pixart/messenger/parser/AbstractParser.java +++ b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.parser; +package eu.siacs.conversations.parser; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -6,14 +6,14 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.MucOptions; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xmpp.InvalidJid; -import de.pixart.messenger.xmpp.stanzas.AbstractStanza; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.MucOptions; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.InvalidJid; +import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; import rocks.xmpp.addr.Jid; public abstract class AbstractParser { diff --git a/src/main/java/de/pixart/messenger/parser/IqParser.java b/src/main/java/eu/siacs/conversations/parser/IqParser.java similarity index 96% rename from src/main/java/de/pixart/messenger/parser/IqParser.java rename to src/main/java/eu/siacs/conversations/parser/IqParser.java index be49eb4315..af888355eb 100644 --- a/src/main/java/de/pixart/messenger/parser/IqParser.java +++ b/src/main/java/eu/siacs/conversations/parser/IqParser.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.parser; +package eu.siacs.conversations.parser; import android.text.TextUtils; import android.util.Base64; @@ -24,20 +24,20 @@ import java.util.List; import java.util.Map; import java.util.Set; -import de.pixart.messenger.Config; -import de.pixart.messenger.crypto.axolotl.AxolotlService; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.Room; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.utils.Namespace; -import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xmpp.InvalidJid; -import de.pixart.messenger.xmpp.OnIqPacketReceived; -import de.pixart.messenger.xmpp.OnUpdateBlocklist; -import de.pixart.messenger.xmpp.forms.Data; -import de.pixart.messenger.xmpp.stanzas.IqPacket; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.crypto.axolotl.AxolotlService; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Room; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.utils.Namespace; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.InvalidJid; +import eu.siacs.conversations.xmpp.OnIqPacketReceived; +import eu.siacs.conversations.xmpp.OnUpdateBlocklist; +import eu.siacs.conversations.xmpp.forms.Data; +import eu.siacs.conversations.xmpp.stanzas.IqPacket; import rocks.xmpp.addr.Jid; public class IqParser extends AbstractParser implements OnIqPacketReceived { diff --git a/src/main/java/de/pixart/messenger/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java similarity index 96% rename from src/main/java/de/pixart/messenger/parser/MessageParser.java rename to src/main/java/eu/siacs/conversations/parser/MessageParser.java index ff0c3066ad..0c3c41e639 100644 --- a/src/main/java/de/pixart/messenger/parser/MessageParser.java +++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.parser; +package eu.siacs.conversations.parser; import android.os.Build; import android.text.Html; @@ -20,41 +20,41 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.crypto.OtrService; -import de.pixart.messenger.crypto.axolotl.AxolotlService; -import de.pixart.messenger.crypto.axolotl.BrokenSessionException; -import de.pixart.messenger.crypto.axolotl.NotEncryptedForThisDeviceException; -import de.pixart.messenger.crypto.axolotl.OutdatedSenderException; -import de.pixart.messenger.crypto.axolotl.XmppAxolotlMessage; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Bookmark; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.Conversational; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.entities.MucOptions; -import de.pixart.messenger.entities.Presence; -import de.pixart.messenger.entities.ReadByMarker; -import de.pixart.messenger.entities.ReceiptRequest; -import de.pixart.messenger.entities.ServiceDiscoveryResult; -import de.pixart.messenger.http.HttpConnectionManager; -import de.pixart.messenger.http.P1S3UrlStreamHandler; -import de.pixart.messenger.services.MessageArchiveService; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.utils.CryptoHelper; -import de.pixart.messenger.utils.Namespace; -import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xml.LocalizedContent; -import de.pixart.messenger.xmpp.InvalidJid; -import de.pixart.messenger.xmpp.OnMessagePacketReceived; -import de.pixart.messenger.xmpp.chatstate.ChatState; -import de.pixart.messenger.xmpp.pep.Avatar; -import de.pixart.messenger.xmpp.stanzas.MessagePacket; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.crypto.OtrService; +import eu.siacs.conversations.crypto.axolotl.AxolotlService; +import eu.siacs.conversations.crypto.axolotl.BrokenSessionException; +import eu.siacs.conversations.crypto.axolotl.NotEncryptedForThisDeviceException; +import eu.siacs.conversations.crypto.axolotl.OutdatedSenderException; +import eu.siacs.conversations.crypto.axolotl.XmppAxolotlMessage; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Bookmark; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Conversational; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.entities.MucOptions; +import eu.siacs.conversations.entities.Presence; +import eu.siacs.conversations.entities.ReadByMarker; +import eu.siacs.conversations.entities.ReceiptRequest; +import eu.siacs.conversations.entities.ServiceDiscoveryResult; +import eu.siacs.conversations.http.HttpConnectionManager; +import eu.siacs.conversations.http.P1S3UrlStreamHandler; +import eu.siacs.conversations.services.MessageArchiveService; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.utils.Namespace; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xml.LocalizedContent; +import eu.siacs.conversations.xmpp.InvalidJid; +import eu.siacs.conversations.xmpp.OnMessagePacketReceived; +import eu.siacs.conversations.xmpp.chatstate.ChatState; +import eu.siacs.conversations.xmpp.pep.Avatar; +import eu.siacs.conversations.xmpp.stanzas.MessagePacket; import rocks.xmpp.addr.Jid; -import static de.pixart.messenger.entities.Message.DELETED_MESSAGE_BODY; +import static eu.siacs.conversations.entities.Message.DELETED_MESSAGE_BODY; public class MessageParser extends AbstractParser implements OnMessagePacketReceived { diff --git a/src/main/java/de/pixart/messenger/parser/PresenceParser.java b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java similarity index 94% rename from src/main/java/de/pixart/messenger/parser/PresenceParser.java rename to src/main/java/eu/siacs/conversations/parser/PresenceParser.java index 0006b66a33..7c68bc3118 100644 --- a/src/main/java/de/pixart/messenger/parser/PresenceParser.java +++ b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java @@ -1,29 +1,29 @@ -package de.pixart.messenger.parser; +package eu.siacs.conversations.parser; import android.util.Log; import java.util.ArrayList; import java.util.List; -import de.pixart.messenger.Config; -import de.pixart.messenger.crypto.PgpEngine; -import de.pixart.messenger.crypto.axolotl.AxolotlService; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.entities.MucOptions; -import de.pixart.messenger.entities.Presence; -import de.pixart.messenger.generator.IqGenerator; -import de.pixart.messenger.generator.PresenceGenerator; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.utils.Namespace; -import de.pixart.messenger.utils.XmppUri; -import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xmpp.InvalidJid; -import de.pixart.messenger.xmpp.OnPresencePacketReceived; -import de.pixart.messenger.xmpp.pep.Avatar; -import de.pixart.messenger.xmpp.stanzas.PresencePacket; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.crypto.PgpEngine; +import eu.siacs.conversations.crypto.axolotl.AxolotlService; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.entities.MucOptions; +import eu.siacs.conversations.entities.Presence; +import eu.siacs.conversations.generator.IqGenerator; +import eu.siacs.conversations.generator.PresenceGenerator; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.utils.Namespace; +import eu.siacs.conversations.utils.XmppUri; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.InvalidJid; +import eu.siacs.conversations.xmpp.OnPresencePacketReceived; +import eu.siacs.conversations.xmpp.pep.Avatar; +import eu.siacs.conversations.xmpp.stanzas.PresencePacket; import rocks.xmpp.addr.Jid; public class PresenceParser extends AbstractParser implements diff --git a/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java similarity index 98% rename from src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java rename to src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java index 9ea4c5cd95..e324f491a4 100644 --- a/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java +++ b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.persistance; +package eu.siacs.conversations.persistance; import android.content.ContentValues; import android.content.Context; @@ -38,24 +38,24 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.CopyOnWriteArrayList; -import de.pixart.messenger.Config; -import de.pixart.messenger.crypto.axolotl.AxolotlService; -import de.pixart.messenger.crypto.axolotl.FingerprintStatus; -import de.pixart.messenger.crypto.axolotl.SQLiteAxolotlStore; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.entities.PresenceTemplate; -import de.pixart.messenger.entities.Roster; -import de.pixart.messenger.entities.ServiceDiscoveryResult; -import de.pixart.messenger.services.ShortcutService; -import de.pixart.messenger.utils.CryptoHelper; -import de.pixart.messenger.utils.CursorUtils; -import de.pixart.messenger.utils.FtsUtils; -import de.pixart.messenger.utils.Resolver; -import de.pixart.messenger.xmpp.InvalidJid; -import de.pixart.messenger.xmpp.mam.MamReference; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.crypto.axolotl.AxolotlService; +import eu.siacs.conversations.crypto.axolotl.FingerprintStatus; +import eu.siacs.conversations.crypto.axolotl.SQLiteAxolotlStore; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.entities.PresenceTemplate; +import eu.siacs.conversations.entities.Roster; +import eu.siacs.conversations.entities.ServiceDiscoveryResult; +import eu.siacs.conversations.services.ShortcutService; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.utils.CursorUtils; +import eu.siacs.conversations.utils.FtsUtils; +import eu.siacs.conversations.utils.Resolver; +import eu.siacs.conversations.xmpp.InvalidJid; +import eu.siacs.conversations.xmpp.mam.MamReference; import rocks.xmpp.addr.Jid; public class DatabaseBackend extends SQLiteOpenHelper { diff --git a/src/main/java/de/pixart/messenger/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java similarity index 98% rename from src/main/java/de/pixart/messenger/persistance/FileBackend.java rename to src/main/java/eu/siacs/conversations/persistance/FileBackend.java index 402ea50a1e..1c2fcd70d0 100644 --- a/src/main/java/de/pixart/messenger/persistance/FileBackend.java +++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.persistance; +package eu.siacs.conversations.persistance; import android.annotation.TargetApi; import android.content.ContentResolver; @@ -58,20 +58,20 @@ import java.util.List; import java.util.Locale; import java.util.UUID; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.DownloadableFile; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.services.AttachFileToConversationRunnable; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.ui.util.Attachment; -import de.pixart.messenger.utils.Compatibility; -import de.pixart.messenger.utils.CryptoHelper; -import de.pixart.messenger.utils.ExifHelper; -import de.pixart.messenger.utils.FileUtils; -import de.pixart.messenger.utils.FileWriterException; -import de.pixart.messenger.utils.MimeUtils; -import de.pixart.messenger.xmpp.pep.Avatar; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.DownloadableFile; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.services.AttachFileToConversationRunnable; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.ui.util.Attachment; +import eu.siacs.conversations.utils.Compatibility; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.utils.ExifHelper; +import eu.siacs.conversations.utils.FileUtils; +import eu.siacs.conversations.utils.FileWriterException; +import eu.siacs.conversations.utils.MimeUtils; +import eu.siacs.conversations.xmpp.pep.Avatar; import ezvcard.Ezvcard; import ezvcard.VCard; diff --git a/src/main/java/de/pixart/messenger/persistance/OnPhoneContactsMerged.java b/src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java similarity index 63% rename from src/main/java/de/pixart/messenger/persistance/OnPhoneContactsMerged.java rename to src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java index 6c7b0e52c0..6106c0eeea 100644 --- a/src/main/java/de/pixart/messenger/persistance/OnPhoneContactsMerged.java +++ b/src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.persistance; +package eu.siacs.conversations.persistance; public interface OnPhoneContactsMerged { void phoneContactsMerged(); diff --git a/src/main/java/de/pixart/messenger/services/AbstractConnectionManager.java b/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java similarity index 96% rename from src/main/java/de/pixart/messenger/services/AbstractConnectionManager.java rename to src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java index 7787c89423..7509900064 100644 --- a/src/main/java/de/pixart/messenger/services/AbstractConnectionManager.java +++ b/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; import android.content.Context; import android.os.PowerManager; @@ -25,10 +25,10 @@ import java.util.concurrent.atomic.AtomicLong; import javax.crypto.NoSuchPaddingException; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.DownloadableFile; -import de.pixart.messenger.utils.Compatibility; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.DownloadableFile; +import eu.siacs.conversations.utils.Compatibility; public class AbstractConnectionManager { private static final int UI_REFRESH_THRESHOLD = Config.REFRESH_UI_INTERVAL; diff --git a/src/main/java/de/pixart/messenger/services/AbstractQuickConversationsService.java b/src/main/java/eu/siacs/conversations/services/AbstractQuickConversationsService.java similarity index 93% rename from src/main/java/de/pixart/messenger/services/AbstractQuickConversationsService.java rename to src/main/java/eu/siacs/conversations/services/AbstractQuickConversationsService.java index 068331ba23..1ea34142e3 100644 --- a/src/main/java/de/pixart/messenger/services/AbstractQuickConversationsService.java +++ b/src/main/java/eu/siacs/conversations/services/AbstractQuickConversationsService.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; public abstract class AbstractQuickConversationsService { diff --git a/src/main/java/de/pixart/messenger/services/AlarmReceiver.java b/src/main/java/eu/siacs/conversations/services/AlarmReceiver.java similarity index 84% rename from src/main/java/de/pixart/messenger/services/AlarmReceiver.java rename to src/main/java/eu/siacs/conversations/services/AlarmReceiver.java index eb2dc3c635..d99f3a4d5a 100644 --- a/src/main/java/de/pixart/messenger/services/AlarmReceiver.java +++ b/src/main/java/eu/siacs/conversations/services/AlarmReceiver.java @@ -1,12 +1,12 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.util.Log; -import de.pixart.messenger.Config; -import de.pixart.messenger.utils.Compatibility; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.utils.Compatibility; public class AlarmReceiver extends BroadcastReceiver { public static final int SCHEDULE_ALARM_REQUEST_CODE = 523976483; diff --git a/src/main/java/de/pixart/messenger/services/AttachFileToConversationRunnable.java b/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java similarity index 95% rename from src/main/java/de/pixart/messenger/services/AttachFileToConversationRunnable.java rename to src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java index e8d6524d2f..ef14142288 100644 --- a/src/main/java/de/pixart/messenger/services/AttachFileToConversationRunnable.java +++ b/src/main/java/eu/siacs/conversations/services/AttachFileToConversationRunnable.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; import android.content.Context; import android.content.SharedPreferences; @@ -22,14 +22,14 @@ import java.util.Locale; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.crypto.PgpEngine; -import de.pixart.messenger.entities.DownloadableFile; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.persistance.FileBackend; -import de.pixart.messenger.ui.UiCallback; -import de.pixart.messenger.utils.MimeUtils; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.crypto.PgpEngine; +import eu.siacs.conversations.entities.DownloadableFile; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.ui.UiCallback; +import eu.siacs.conversations.utils.MimeUtils; public class AttachFileToConversationRunnable implements Runnable, MediaTranscoder.Listener { diff --git a/src/main/java/de/pixart/messenger/services/AudioPlayer.java b/src/main/java/eu/siacs/conversations/services/AudioPlayer.java similarity index 97% rename from src/main/java/de/pixart/messenger/services/AudioPlayer.java rename to src/main/java/eu/siacs/conversations/services/AudioPlayer.java index 59e7416ead..e4f4d352cc 100644 --- a/src/main/java/de/pixart/messenger/services/AudioPlayer.java +++ b/src/main/java/eu/siacs/conversations/services/AudioPlayer.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; import android.Manifest; import android.content.Context; @@ -29,13 +29,13 @@ import java.util.Locale; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.ui.ConversationsActivity; -import de.pixart.messenger.ui.adapter.MessageAdapter; -import de.pixart.messenger.ui.util.PendingItem; -import de.pixart.messenger.utils.WeakReferenceSet; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.ui.ConversationsActivity; +import eu.siacs.conversations.ui.adapter.MessageAdapter; +import eu.siacs.conversations.ui.util.PendingItem; +import eu.siacs.conversations.utils.WeakReferenceSet; public class AudioPlayer implements View.OnClickListener, MediaPlayer.OnCompletionListener, SeekBar.OnSeekBarChangeListener, Runnable, SensorEventListener { diff --git a/src/main/java/de/pixart/messenger/services/AvatarService.java b/src/main/java/eu/siacs/conversations/services/AvatarService.java similarity index 97% rename from src/main/java/de/pixart/messenger/services/AvatarService.java rename to src/main/java/eu/siacs/conversations/services/AvatarService.java index 5a96c929c2..8114bf4493 100644 --- a/src/main/java/de/pixart/messenger/services/AvatarService.java +++ b/src/main/java/eu/siacs/conversations/services/AvatarService.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; import android.content.Context; import android.content.res.Resources; @@ -29,24 +29,24 @@ import java.util.List; import java.util.Locale; import java.util.Set; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Bookmark; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.Conversational; -import de.pixart.messenger.entities.ListItem; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.entities.MucOptions; -import de.pixart.messenger.entities.RawBlockable; -import de.pixart.messenger.entities.Room; -import de.pixart.messenger.utils.UIHelper; -import de.pixart.messenger.xmpp.OnAdvancedStreamFeaturesLoaded; -import de.pixart.messenger.xmpp.XmppConnection; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Bookmark; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Conversational; +import eu.siacs.conversations.entities.ListItem; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.entities.MucOptions; +import eu.siacs.conversations.entities.RawBlockable; +import eu.siacs.conversations.entities.Room; +import eu.siacs.conversations.utils.UIHelper; +import eu.siacs.conversations.xmpp.OnAdvancedStreamFeaturesLoaded; +import eu.siacs.conversations.xmpp.XmppConnection; import rocks.xmpp.addr.Jid; -import static de.pixart.messenger.ui.SettingsActivity.PREFER_XMPP_AVATAR; +import static eu.siacs.conversations.ui.SettingsActivity.PREFER_XMPP_AVATAR; public class AvatarService implements OnAdvancedStreamFeaturesLoaded { diff --git a/src/main/java/de/pixart/messenger/services/BarcodeProvider.java b/src/main/java/eu/siacs/conversations/services/BarcodeProvider.java similarity index 97% rename from src/main/java/de/pixart/messenger/services/BarcodeProvider.java rename to src/main/java/eu/siacs/conversations/services/BarcodeProvider.java index 00baf7b163..71f132426d 100644 --- a/src/main/java/de/pixart/messenger/services/BarcodeProvider.java +++ b/src/main/java/eu/siacs/conversations/services/BarcodeProvider.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; import android.content.ComponentName; import android.content.ContentProvider; @@ -29,9 +29,9 @@ import java.io.FileOutputStream; import java.io.OutputStream; import java.util.Hashtable; -import de.pixart.messenger.Config; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.utils.CryptoHelper; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.utils.CryptoHelper; import rocks.xmpp.addr.Jid; public class BarcodeProvider extends ContentProvider implements ServiceConnection { diff --git a/src/main/java/de/pixart/messenger/services/ChannelDiscoveryService.java b/src/main/java/eu/siacs/conversations/services/ChannelDiscoveryService.java similarity index 95% rename from src/main/java/de/pixart/messenger/services/ChannelDiscoveryService.java rename to src/main/java/eu/siacs/conversations/services/ChannelDiscoveryService.java index 81668cb920..9e0a3ca18f 100644 --- a/src/main/java/de/pixart/messenger/services/ChannelDiscoveryService.java +++ b/src/main/java/eu/siacs/conversations/services/ChannelDiscoveryService.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; import android.util.Log; @@ -17,15 +17,15 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import de.pixart.messenger.Config; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Room; -import de.pixart.messenger.http.HttpConnectionManager; -import de.pixart.messenger.http.services.MuclumbusService; -import de.pixart.messenger.parser.IqParser; -import de.pixart.messenger.xmpp.OnIqPacketReceived; -import de.pixart.messenger.xmpp.XmppConnection; -import de.pixart.messenger.xmpp.stanzas.IqPacket; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Room; +import eu.siacs.conversations.http.HttpConnectionManager; +import eu.siacs.conversations.http.services.MuclumbusService; +import eu.siacs.conversations.parser.IqParser; +import eu.siacs.conversations.xmpp.OnIqPacketReceived; +import eu.siacs.conversations.xmpp.XmppConnection; +import eu.siacs.conversations.xmpp.stanzas.IqPacket; import okhttp3.OkHttpClient; import okhttp3.ResponseBody; import retrofit2.Call; diff --git a/src/main/java/de/pixart/messenger/services/ContactChooserTargetService.java b/src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java similarity index 94% rename from src/main/java/de/pixart/messenger/services/ContactChooserTargetService.java rename to src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java index 7bda592e56..d8fcf6adb9 100644 --- a/src/main/java/de/pixart/messenger/services/ContactChooserTargetService.java +++ b/src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; import android.annotation.TargetApi; import android.content.ComponentName; @@ -16,9 +16,9 @@ import android.service.chooser.ChooserTargetService; import java.util.ArrayList; import java.util.List; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.ui.ConversationsActivity; -import de.pixart.messenger.utils.Compatibility; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.ui.ConversationsActivity; +import eu.siacs.conversations.utils.Compatibility; @TargetApi(Build.VERSION_CODES.M) public class ContactChooserTargetService extends ChooserTargetService implements ServiceConnection { diff --git a/src/main/java/de/pixart/messenger/services/EventReceiver.java b/src/main/java/eu/siacs/conversations/services/EventReceiver.java similarity index 91% rename from src/main/java/de/pixart/messenger/services/EventReceiver.java rename to src/main/java/eu/siacs/conversations/services/EventReceiver.java index ff501c5afd..d5f4cf13a9 100644 --- a/src/main/java/de/pixart/messenger/services/EventReceiver.java +++ b/src/main/java/eu/siacs/conversations/services/EventReceiver.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; import android.content.BroadcastReceiver; import android.content.Context; @@ -7,8 +7,8 @@ import android.os.Bundle; import android.preference.PreferenceManager; import android.util.Log; -import de.pixart.messenger.Config; -import de.pixart.messenger.utils.Compatibility; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.utils.Compatibility; public class EventReceiver extends BroadcastReceiver { diff --git a/src/main/java/de/pixart/messenger/services/ExportBackupService.java b/src/main/java/eu/siacs/conversations/services/ExportBackupService.java similarity index 97% rename from src/main/java/de/pixart/messenger/services/ExportBackupService.java rename to src/main/java/eu/siacs/conversations/services/ExportBackupService.java index 51fa358dbb..2d31e22b85 100644 --- a/src/main/java/de/pixart/messenger/services/ExportBackupService.java +++ b/src/main/java/eu/siacs/conversations/services/ExportBackupService.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; import android.app.Notification; import android.app.NotificationManager; @@ -45,20 +45,20 @@ import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.PBEKeySpec; import javax.crypto.spec.SecretKeySpec; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.crypto.axolotl.SQLiteAxolotlStore; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.persistance.DatabaseBackend; -import de.pixart.messenger.persistance.FileBackend; -import de.pixart.messenger.utils.BackupFileHeader; -import de.pixart.messenger.utils.Compatibility; -import de.pixart.messenger.utils.WakeLockHelper; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.crypto.axolotl.SQLiteAxolotlStore; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.persistance.DatabaseBackend; +import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.utils.BackupFileHeader; +import eu.siacs.conversations.utils.Compatibility; +import eu.siacs.conversations.utils.WakeLockHelper; import rocks.xmpp.addr.Jid; -import static de.pixart.messenger.utils.Compatibility.runsTwentySix; +import static eu.siacs.conversations.utils.Compatibility.runsTwentySix; public class ExportBackupService extends Service { diff --git a/src/main/java/de/pixart/messenger/services/ImportBackupService.java b/src/main/java/eu/siacs/conversations/services/ImportBackupService.java similarity index 95% rename from src/main/java/de/pixart/messenger/services/ImportBackupService.java rename to src/main/java/eu/siacs/conversations/services/ImportBackupService.java index d695a23d7f..aa6f9a9d46 100644 --- a/src/main/java/de/pixart/messenger/services/ImportBackupService.java +++ b/src/main/java/eu/siacs/conversations/services/ImportBackupService.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; import android.app.NotificationManager; import android.app.PendingIntent; @@ -39,19 +39,19 @@ import javax.crypto.CipherInputStream; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.persistance.DatabaseBackend; -import de.pixart.messenger.persistance.FileBackend; -import de.pixart.messenger.ui.ManageAccountActivity; -import de.pixart.messenger.utils.BackupFileHeader; -import de.pixart.messenger.utils.Compatibility; -import de.pixart.messenger.utils.SerialSingleThreadExecutor; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.persistance.DatabaseBackend; +import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.ui.ManageAccountActivity; +import eu.siacs.conversations.utils.BackupFileHeader; +import eu.siacs.conversations.utils.Compatibility; +import eu.siacs.conversations.utils.SerialSingleThreadExecutor; import rocks.xmpp.addr.Jid; -import static de.pixart.messenger.services.ExportBackupService.CIPHERMODE; -import static de.pixart.messenger.services.ExportBackupService.KEYTYPE; -import static de.pixart.messenger.services.ExportBackupService.PROVIDER; +import static eu.siacs.conversations.services.ExportBackupService.CIPHERMODE; +import static eu.siacs.conversations.services.ExportBackupService.KEYTYPE; +import static eu.siacs.conversations.services.ExportBackupService.PROVIDER; public class ImportBackupService extends Service { diff --git a/src/main/java/de/pixart/messenger/services/MediaPlayer.java b/src/main/java/eu/siacs/conversations/services/MediaPlayer.java similarity index 88% rename from src/main/java/de/pixart/messenger/services/MediaPlayer.java rename to src/main/java/eu/siacs/conversations/services/MediaPlayer.java index 59e8bfecbe..1fbc34517b 100644 --- a/src/main/java/de/pixart/messenger/services/MediaPlayer.java +++ b/src/main/java/eu/siacs/conversations/services/MediaPlayer.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; public class MediaPlayer extends android.media.MediaPlayer { private int streamType; diff --git a/src/main/java/de/pixart/messenger/services/MemorizingTrustManager.java b/src/main/java/eu/siacs/conversations/services/MemorizingTrustManager.java similarity index 99% rename from src/main/java/de/pixart/messenger/services/MemorizingTrustManager.java rename to src/main/java/eu/siacs/conversations/services/MemorizingTrustManager.java index 3534b65bfe..1e5d48edfe 100644 --- a/src/main/java/de/pixart/messenger/services/MemorizingTrustManager.java +++ b/src/main/java/eu/siacs/conversations/services/MemorizingTrustManager.java @@ -24,7 +24,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; import android.app.Application; import android.app.NotificationManager; @@ -80,11 +80,11 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.TrustManagerFactory; import javax.net.ssl.X509TrustManager; -import de.pixart.messenger.R; -import de.pixart.messenger.crypto.DomainHostnameVerifier; -import de.pixart.messenger.entities.MTMDecision; -import de.pixart.messenger.persistance.FileBackend; -import de.pixart.messenger.ui.MemorizingActivity; +import eu.siacs.conversations.R; +import eu.siacs.conversations.crypto.DomainHostnameVerifier; +import eu.siacs.conversations.entities.MTMDecision; +import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.ui.MemorizingActivity; /** * A X509 trust manager implementation which asks the user about invalid diff --git a/src/main/java/de/pixart/messenger/services/MessageArchiveService.java b/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java similarity index 97% rename from src/main/java/de/pixart/messenger/services/MessageArchiveService.java rename to src/main/java/eu/siacs/conversations/services/MessageArchiveService.java index ec4c56e1c4..9e5fa8251b 100644 --- a/src/main/java/de/pixart/messenger/services/MessageArchiveService.java +++ b/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; import android.util.Log; @@ -8,18 +8,18 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.Conversational; -import de.pixart.messenger.entities.ReceiptRequest; -import de.pixart.messenger.generator.AbstractGenerator; -import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xmpp.OnAdvancedStreamFeaturesLoaded; -import de.pixart.messenger.xmpp.mam.MamReference; -import de.pixart.messenger.xmpp.stanzas.IqPacket; -import de.pixart.messenger.xmpp.stanzas.MessagePacket; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Conversational; +import eu.siacs.conversations.entities.ReceiptRequest; +import eu.siacs.conversations.generator.AbstractGenerator; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.OnAdvancedStreamFeaturesLoaded; +import eu.siacs.conversations.xmpp.mam.MamReference; +import eu.siacs.conversations.xmpp.stanzas.IqPacket; +import eu.siacs.conversations.xmpp.stanzas.MessagePacket; import rocks.xmpp.addr.Jid; public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded { diff --git a/src/main/java/de/pixart/messenger/services/MessageSearchTask.java b/src/main/java/eu/siacs/conversations/services/MessageSearchTask.java similarity index 91% rename from src/main/java/de/pixart/messenger/services/MessageSearchTask.java rename to src/main/java/eu/siacs/conversations/services/MessageSearchTask.java index 836b34b3be..dbfa74e685 100644 --- a/src/main/java/de/pixart/messenger/services/MessageSearchTask.java +++ b/src/main/java/eu/siacs/conversations/services/MessageSearchTask.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; import android.database.Cursor; import android.os.SystemClock; @@ -37,17 +37,17 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import de.pixart.messenger.Config; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.Conversational; -import de.pixart.messenger.entities.IndividualMessage; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.entities.StubConversation; -import de.pixart.messenger.ui.interfaces.OnSearchResultsAvailable; -import de.pixart.messenger.utils.Cancellable; -import de.pixart.messenger.utils.MessageUtils; -import de.pixart.messenger.utils.ReplacingSerialSingleThreadExecutor; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Conversational; +import eu.siacs.conversations.entities.IndividualMessage; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.entities.StubConversation; +import eu.siacs.conversations.ui.interfaces.OnSearchResultsAvailable; +import eu.siacs.conversations.utils.Cancellable; +import eu.siacs.conversations.utils.MessageUtils; +import eu.siacs.conversations.utils.ReplacingSerialSingleThreadExecutor; import rocks.xmpp.addr.Jid; public class MessageSearchTask implements Runnable, Cancellable { diff --git a/src/main/java/de/pixart/messenger/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java similarity index 98% rename from src/main/java/de/pixart/messenger/services/NotificationService.java rename to src/main/java/eu/siacs/conversations/services/NotificationService.java index fe97344c06..313253fa75 100644 --- a/src/main/java/de/pixart/messenger/services/NotificationService.java +++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; import android.app.Notification; import android.app.NotificationChannel; @@ -46,25 +46,25 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.Conversational; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.persistance.FileBackend; -import de.pixart.messenger.ui.ConversationsActivity; -import de.pixart.messenger.ui.EditAccountActivity; -import de.pixart.messenger.ui.TimePreference; -import de.pixart.messenger.utils.AccountUtils; -import de.pixart.messenger.utils.Compatibility; -import de.pixart.messenger.utils.EmojiWrapper; -import de.pixart.messenger.utils.GeoHelper; -import de.pixart.messenger.utils.UIHelper; -import de.pixart.messenger.xmpp.XmppConnection; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Conversational; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.ui.ConversationsActivity; +import eu.siacs.conversations.ui.EditAccountActivity; +import eu.siacs.conversations.ui.TimePreference; +import eu.siacs.conversations.utils.AccountUtils; +import eu.siacs.conversations.utils.Compatibility; +import eu.siacs.conversations.utils.EmojiWrapper; +import eu.siacs.conversations.utils.GeoHelper; +import eu.siacs.conversations.utils.UIHelper; +import eu.siacs.conversations.xmpp.XmppConnection; -import static de.pixart.messenger.ui.util.MyLinkify.replaceYoutube; +import static eu.siacs.conversations.ui.util.MyLinkify.replaceYoutube; public class NotificationService { @@ -75,7 +75,7 @@ public class NotificationService { public static final String UPDATE_CHANNEL_ID = "appupdate"; public static final String VIDEOCOMPRESSION_CHANNEL_ID = "compression"; public static final String ERROR_CHANNEL_ID = "error"; - private static final String CONVERSATIONS_GROUP = "de.pixart.messenger"; + private static final String CONVERSATIONS_GROUP = "eu.siacs.conversations"; private static final int NOTIFICATION_ID_MULTIPLIER = 1024 * 1024; public static final int NOTIFICATION_ID = 2 * NOTIFICATION_ID_MULTIPLIER; public static final int FOREGROUND_NOTIFICATION_ID = NOTIFICATION_ID_MULTIPLIER * 4; diff --git a/src/main/java/de/pixart/messenger/services/QuickConversationsService.java b/src/main/java/eu/siacs/conversations/services/QuickConversationsService.java similarity index 92% rename from src/main/java/de/pixart/messenger/services/QuickConversationsService.java rename to src/main/java/eu/siacs/conversations/services/QuickConversationsService.java index e268ac8560..1d83a5cb57 100644 --- a/src/main/java/de/pixart/messenger/services/QuickConversationsService.java +++ b/src/main/java/eu/siacs/conversations/services/QuickConversationsService.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; public class QuickConversationsService extends AbstractQuickConversationsService { diff --git a/src/main/java/de/pixart/messenger/services/ShortcutService.java b/src/main/java/eu/siacs/conversations/services/ShortcutService.java similarity index 95% rename from src/main/java/de/pixart/messenger/services/ShortcutService.java rename to src/main/java/eu/siacs/conversations/services/ShortcutService.java index e01634e22a..b8bdc2cf02 100644 --- a/src/main/java/de/pixart/messenger/services/ShortcutService.java +++ b/src/main/java/eu/siacs/conversations/services/ShortcutService.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; import android.annotation.TargetApi; import android.content.Intent; @@ -16,11 +16,11 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import de.pixart.messenger.Config; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.ui.StartConversationActivity; -import de.pixart.messenger.utils.ReplacingSerialSingleThreadExecutor; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.ui.StartConversationActivity; +import eu.siacs.conversations.utils.ReplacingSerialSingleThreadExecutor; import rocks.xmpp.addr.Jid; public class ShortcutService { diff --git a/src/main/java/de/pixart/messenger/services/UpdateService.java b/src/main/java/eu/siacs/conversations/services/UpdateService.java similarity index 96% rename from src/main/java/de/pixart/messenger/services/UpdateService.java rename to src/main/java/eu/siacs/conversations/services/UpdateService.java index 27b40e9863..67f37a45dd 100644 --- a/src/main/java/de/pixart/messenger/services/UpdateService.java +++ b/src/main/java/eu/siacs/conversations/services/UpdateService.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; import android.app.PendingIntent; import android.content.Context; @@ -23,14 +23,14 @@ import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocketFactory; -import de.pixart.messenger.BuildConfig; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.http.NoSSLv3SocketFactory; -import de.pixart.messenger.ui.UpdaterActivity; +import eu.siacs.conversations.BuildConfig; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.http.NoSSLv3SocketFactory; +import eu.siacs.conversations.ui.UpdaterActivity; import me.drakeet.support.toast.ToastCompat; -import static de.pixart.messenger.http.HttpConnectionManager.getProxy; +import static eu.siacs.conversations.http.HttpConnectionManager.getProxy; public class UpdateService extends AsyncTask { private boolean mUseTor; diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java similarity index 97% rename from src/main/java/de/pixart/messenger/services/XmppConnectionService.java rename to src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index a51dbe49ff..aa34de4389 100644 --- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; import android.Manifest; import android.annotation.SuppressLint; @@ -85,96 +85,96 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; -import de.pixart.messenger.BuildConfig; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.android.JabberIdContact; -import de.pixart.messenger.crypto.OmemoSetting; -import de.pixart.messenger.crypto.PgpDecryptionService; -import de.pixart.messenger.crypto.PgpEngine; -import de.pixart.messenger.crypto.axolotl.AxolotlService; -import de.pixart.messenger.crypto.axolotl.FingerprintStatus; -import de.pixart.messenger.crypto.axolotl.XmppAxolotlMessage; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Blockable; -import de.pixart.messenger.entities.Bookmark; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.Conversational; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.entities.MucOptions; -import de.pixart.messenger.entities.MucOptions.OnRenameListener; -import de.pixart.messenger.entities.Presence; -import de.pixart.messenger.entities.PresenceTemplate; -import de.pixart.messenger.entities.Roster; -import de.pixart.messenger.entities.ServiceDiscoveryResult; -import de.pixart.messenger.generator.AbstractGenerator; -import de.pixart.messenger.generator.IqGenerator; -import de.pixart.messenger.generator.MessageGenerator; -import de.pixart.messenger.generator.PresenceGenerator; -import de.pixart.messenger.http.CustomURLStreamHandlerFactory; -import de.pixart.messenger.http.HttpConnectionManager; -import de.pixart.messenger.parser.AbstractParser; -import de.pixart.messenger.parser.IqParser; -import de.pixart.messenger.parser.MessageParser; -import de.pixart.messenger.parser.PresenceParser; -import de.pixart.messenger.persistance.DatabaseBackend; -import de.pixart.messenger.persistance.FileBackend; -import de.pixart.messenger.ui.ChooseAccountForProfilePictureActivity; -import de.pixart.messenger.ui.SettingsActivity; -import de.pixart.messenger.ui.UiCallback; -import de.pixart.messenger.ui.interfaces.OnAvatarPublication; -import de.pixart.messenger.ui.interfaces.OnMediaLoaded; -import de.pixart.messenger.ui.interfaces.OnSearchResultsAvailable; -import de.pixart.messenger.utils.Compatibility; -import de.pixart.messenger.utils.ConversationsFileObserver; -import de.pixart.messenger.utils.CryptoHelper; -import de.pixart.messenger.utils.ExceptionHelper; -import de.pixart.messenger.utils.MimeUtils; -import de.pixart.messenger.utils.Namespace; -import de.pixart.messenger.utils.PhoneHelper; -import de.pixart.messenger.utils.QuickLoader; -import de.pixart.messenger.utils.ReplacingSerialSingleThreadExecutor; -import de.pixart.messenger.utils.ReplacingTaskManager; -import de.pixart.messenger.utils.Resolver; -import de.pixart.messenger.utils.SerialSingleThreadExecutor; -import de.pixart.messenger.utils.StringUtils; -import de.pixart.messenger.utils.WakeLockHelper; -import de.pixart.messenger.utils.XmppUri; -import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xmpp.OnBindListener; -import de.pixart.messenger.xmpp.OnContactStatusChanged; -import de.pixart.messenger.xmpp.OnIqPacketReceived; -import de.pixart.messenger.xmpp.OnKeyStatusUpdated; -import de.pixart.messenger.xmpp.OnMessageAcknowledged; -import de.pixart.messenger.xmpp.OnMessagePacketReceived; -import de.pixart.messenger.xmpp.OnPresencePacketReceived; -import de.pixart.messenger.xmpp.OnStatusChanged; -import de.pixart.messenger.xmpp.OnUpdateBlocklist; -import de.pixart.messenger.xmpp.Patches; -import de.pixart.messenger.xmpp.XmppConnection; -import de.pixart.messenger.xmpp.chatstate.ChatState; -import de.pixart.messenger.xmpp.forms.Data; -import de.pixart.messenger.xmpp.jid.OtrJidHelper; -import de.pixart.messenger.xmpp.jingle.JingleConnectionManager; -import de.pixart.messenger.xmpp.jingle.OnJinglePacketReceived; -import de.pixart.messenger.xmpp.jingle.stanzas.JinglePacket; -import de.pixart.messenger.xmpp.mam.MamReference; -import de.pixart.messenger.xmpp.pep.Avatar; -import de.pixart.messenger.xmpp.pep.PublishOptions; -import de.pixart.messenger.xmpp.stanzas.IqPacket; -import de.pixart.messenger.xmpp.stanzas.MessagePacket; -import de.pixart.messenger.xmpp.stanzas.PresencePacket; +import eu.siacs.conversations.BuildConfig; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.android.JabberIdContact; +import eu.siacs.conversations.crypto.OmemoSetting; +import eu.siacs.conversations.crypto.PgpDecryptionService; +import eu.siacs.conversations.crypto.PgpEngine; +import eu.siacs.conversations.crypto.axolotl.AxolotlService; +import eu.siacs.conversations.crypto.axolotl.FingerprintStatus; +import eu.siacs.conversations.crypto.axolotl.XmppAxolotlMessage; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Blockable; +import eu.siacs.conversations.entities.Bookmark; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Conversational; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.entities.MucOptions; +import eu.siacs.conversations.entities.MucOptions.OnRenameListener; +import eu.siacs.conversations.entities.Presence; +import eu.siacs.conversations.entities.PresenceTemplate; +import eu.siacs.conversations.entities.Roster; +import eu.siacs.conversations.entities.ServiceDiscoveryResult; +import eu.siacs.conversations.generator.AbstractGenerator; +import eu.siacs.conversations.generator.IqGenerator; +import eu.siacs.conversations.generator.MessageGenerator; +import eu.siacs.conversations.generator.PresenceGenerator; +import eu.siacs.conversations.http.CustomURLStreamHandlerFactory; +import eu.siacs.conversations.http.HttpConnectionManager; +import eu.siacs.conversations.parser.AbstractParser; +import eu.siacs.conversations.parser.IqParser; +import eu.siacs.conversations.parser.MessageParser; +import eu.siacs.conversations.parser.PresenceParser; +import eu.siacs.conversations.persistance.DatabaseBackend; +import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.ui.ChooseAccountForProfilePictureActivity; +import eu.siacs.conversations.ui.SettingsActivity; +import eu.siacs.conversations.ui.UiCallback; +import eu.siacs.conversations.ui.interfaces.OnAvatarPublication; +import eu.siacs.conversations.ui.interfaces.OnMediaLoaded; +import eu.siacs.conversations.ui.interfaces.OnSearchResultsAvailable; +import eu.siacs.conversations.utils.Compatibility; +import eu.siacs.conversations.utils.ConversationsFileObserver; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.utils.ExceptionHelper; +import eu.siacs.conversations.utils.MimeUtils; +import eu.siacs.conversations.utils.Namespace; +import eu.siacs.conversations.utils.PhoneHelper; +import eu.siacs.conversations.utils.QuickLoader; +import eu.siacs.conversations.utils.ReplacingSerialSingleThreadExecutor; +import eu.siacs.conversations.utils.ReplacingTaskManager; +import eu.siacs.conversations.utils.Resolver; +import eu.siacs.conversations.utils.SerialSingleThreadExecutor; +import eu.siacs.conversations.utils.StringUtils; +import eu.siacs.conversations.utils.WakeLockHelper; +import eu.siacs.conversations.utils.XmppUri; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.OnBindListener; +import eu.siacs.conversations.xmpp.OnContactStatusChanged; +import eu.siacs.conversations.xmpp.OnIqPacketReceived; +import eu.siacs.conversations.xmpp.OnKeyStatusUpdated; +import eu.siacs.conversations.xmpp.OnMessageAcknowledged; +import eu.siacs.conversations.xmpp.OnMessagePacketReceived; +import eu.siacs.conversations.xmpp.OnPresencePacketReceived; +import eu.siacs.conversations.xmpp.OnStatusChanged; +import eu.siacs.conversations.xmpp.OnUpdateBlocklist; +import eu.siacs.conversations.xmpp.Patches; +import eu.siacs.conversations.xmpp.XmppConnection; +import eu.siacs.conversations.xmpp.chatstate.ChatState; +import eu.siacs.conversations.xmpp.forms.Data; +import eu.siacs.conversations.xmpp.jid.OtrJidHelper; +import eu.siacs.conversations.xmpp.jingle.JingleConnectionManager; +import eu.siacs.conversations.xmpp.jingle.OnJinglePacketReceived; +import eu.siacs.conversations.xmpp.jingle.stanzas.JinglePacket; +import eu.siacs.conversations.xmpp.mam.MamReference; +import eu.siacs.conversations.xmpp.pep.Avatar; +import eu.siacs.conversations.xmpp.pep.PublishOptions; +import eu.siacs.conversations.xmpp.stanzas.IqPacket; +import eu.siacs.conversations.xmpp.stanzas.MessagePacket; +import eu.siacs.conversations.xmpp.stanzas.PresencePacket; import me.leolin.shortcutbadger.ShortcutBadger; import rocks.xmpp.addr.Jid; -import static de.pixart.messenger.ui.SettingsActivity.ALLOW_MESSAGE_CORRECTION; -import static de.pixart.messenger.ui.SettingsActivity.CHAT_STATES; -import static de.pixart.messenger.ui.SettingsActivity.CONFIRM_MESSAGES; -import static de.pixart.messenger.ui.SettingsActivity.ENABLE_MULTI_ACCOUNTS; -import static de.pixart.messenger.ui.SettingsActivity.INDICATE_RECEIVED; -import static de.pixart.messenger.ui.SettingsActivity.SHOW_OWN_ACCOUNTS; -import static de.pixart.messenger.utils.RichPreview.RICH_LINK_METADATA; +import static eu.siacs.conversations.ui.SettingsActivity.ALLOW_MESSAGE_CORRECTION; +import static eu.siacs.conversations.ui.SettingsActivity.CHAT_STATES; +import static eu.siacs.conversations.ui.SettingsActivity.CONFIRM_MESSAGES; +import static eu.siacs.conversations.ui.SettingsActivity.ENABLE_MULTI_ACCOUNTS; +import static eu.siacs.conversations.ui.SettingsActivity.INDICATE_RECEIVED; +import static eu.siacs.conversations.ui.SettingsActivity.SHOW_OWN_ACCOUNTS; +import static eu.siacs.conversations.utils.RichPreview.RICH_LINK_METADATA; public class XmppConnectionService extends Service { @@ -187,7 +187,7 @@ public class XmppConnectionService extends Service { public static final String ACTION_IDLE_PING = "idle_ping"; public static final String ACTION_FCM_TOKEN_REFRESH = "fcm_token_refresh"; public static final String ACTION_FCM_MESSAGE_RECEIVED = "fcm_message_received"; - private static final String ACTION_POST_CONNECTIVITY_CHANGE = "de.pixart.messenger.POST_CONNECTIVITY_CHANGE"; + private static final String ACTION_POST_CONNECTIVITY_CHANGE = "eu.siacs.conversations.POST_CONNECTIVITY_CHANGE"; public static final String FDroid = "org.fdroid.fdroid"; public static final String PlayStore = "com.android.vending"; private static final String SETTING_LAST_ACTIVITY_TS = "last_activity_timestamp"; diff --git a/src/main/java/de/pixart/messenger/ui/AboutActivity.java b/src/main/java/eu/siacs/conversations/ui/AboutActivity.java similarity index 94% rename from src/main/java/de/pixart/messenger/ui/AboutActivity.java rename to src/main/java/eu/siacs/conversations/ui/AboutActivity.java index 0efaa57c1a..3a3bee32e4 100644 --- a/src/main/java/de/pixart/messenger/ui/AboutActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/AboutActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.Intent; import android.net.Uri; @@ -9,8 +9,8 @@ import android.widget.Toast; import java.util.Calendar; -import de.pixart.messenger.R; -import de.pixart.messenger.utils.ThemeHelper; +import eu.siacs.conversations.R; +import eu.siacs.conversations.utils.ThemeHelper; import me.drakeet.support.toast.ToastCompat; public class AboutActivity extends XmppActivity { diff --git a/src/main/java/de/pixart/messenger/ui/AboutPreference.java b/src/main/java/eu/siacs/conversations/ui/AboutPreference.java similarity index 87% rename from src/main/java/de/pixart/messenger/ui/AboutPreference.java rename to src/main/java/eu/siacs/conversations/ui/AboutPreference.java index 1cfd8cbd65..82ffedcc3b 100644 --- a/src/main/java/de/pixart/messenger/ui/AboutPreference.java +++ b/src/main/java/eu/siacs/conversations/ui/AboutPreference.java @@ -1,12 +1,12 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.Context; import android.content.Intent; import android.preference.Preference; import android.util.AttributeSet; -import de.pixart.messenger.R; -import de.pixart.messenger.utils.PhoneHelper; +import eu.siacs.conversations.R; +import eu.siacs.conversations.utils.PhoneHelper; public class AboutPreference extends Preference { public AboutPreference(final Context context, final AttributeSet attrs, final int defStyle) { diff --git a/src/main/java/de/pixart/messenger/ui/AbstractSearchableListItemActivity.java b/src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java similarity index 94% rename from src/main/java/de/pixart/messenger/ui/AbstractSearchableListItemActivity.java rename to src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java index 5c10be4d8a..ffb41acff5 100644 --- a/src/main/java/de/pixart/messenger/ui/AbstractSearchableListItemActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.Context; import android.os.Bundle; @@ -20,10 +20,10 @@ import androidx.databinding.DataBindingUtil; import java.util.ArrayList; import java.util.List; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.ActivityChooseContactBinding; -import de.pixart.messenger.entities.ListItem; -import de.pixart.messenger.ui.adapter.ListItemAdapter; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.ActivityChooseContactBinding; +import eu.siacs.conversations.entities.ListItem; +import eu.siacs.conversations.ui.adapter.ListItemAdapter; public abstract class AbstractSearchableListItemActivity extends XmppActivity implements TextView.OnEditorActionListener { protected ActivityChooseContactBinding binding; diff --git a/src/main/java/de/pixart/messenger/ui/ActionBarActivity.java b/src/main/java/eu/siacs/conversations/ui/ActionBarActivity.java similarity index 96% rename from src/main/java/de/pixart/messenger/ui/ActionBarActivity.java rename to src/main/java/eu/siacs/conversations/ui/ActionBarActivity.java index b007edb269..151c5851ba 100644 --- a/src/main/java/de/pixart/messenger/ui/ActionBarActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ActionBarActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.SharedPreferences; import android.preference.PreferenceManager; @@ -9,7 +9,7 @@ import androidx.annotation.BoolRes; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; -import de.pixart.messenger.R; +import eu.siacs.conversations.R; public abstract class ActionBarActivity extends AppCompatActivity { public static void configureActionBar(ActionBar actionBar) { diff --git a/src/main/java/de/pixart/messenger/ui/BlockContactDialog.java b/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java similarity index 91% rename from src/main/java/de/pixart/messenger/ui/BlockContactDialog.java rename to src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java index 7e30182538..3f5ca1ec4d 100644 --- a/src/main/java/de/pixart/messenger/ui/BlockContactDialog.java +++ b/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.view.View; import android.widget.Toast; @@ -7,11 +7,11 @@ import androidx.annotation.StringRes; import androidx.appcompat.app.AlertDialog; import androidx.databinding.DataBindingUtil; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.DialogBlockContactBinding; -import de.pixart.messenger.entities.Blockable; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.ui.util.JidDialog; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.DialogBlockContactBinding; +import eu.siacs.conversations.entities.Blockable; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.ui.util.JidDialog; import me.drakeet.support.toast.ToastCompat; import rocks.xmpp.addr.Jid; diff --git a/src/main/java/de/pixart/messenger/ui/BlocklistActivity.java b/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java similarity index 90% rename from src/main/java/de/pixart/messenger/ui/BlocklistActivity.java rename to src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java index b261c1292c..edc2801f59 100644 --- a/src/main/java/de/pixart/messenger/ui/BlocklistActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.os.Bundle; import android.text.Editable; @@ -9,13 +9,13 @@ import androidx.fragment.app.FragmentTransaction; import java.util.Collections; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Blockable; -import de.pixart.messenger.entities.ListItem; -import de.pixart.messenger.entities.RawBlockable; -import de.pixart.messenger.ui.interfaces.OnBackendConnected; -import de.pixart.messenger.xmpp.OnUpdateBlocklist; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Blockable; +import eu.siacs.conversations.entities.ListItem; +import eu.siacs.conversations.entities.RawBlockable; +import eu.siacs.conversations.ui.interfaces.OnBackendConnected; +import eu.siacs.conversations.xmpp.OnUpdateBlocklist; import me.drakeet.support.toast.ToastCompat; import rocks.xmpp.addr.Jid; diff --git a/src/main/java/de/pixart/messenger/ui/ChangePasswordActivity.java b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java similarity index 94% rename from src/main/java/de/pixart/messenger/ui/ChangePasswordActivity.java rename to src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java index fca9f6eb32..b2c0b9b021 100644 --- a/src/main/java/de/pixart/messenger/ui/ChangePasswordActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.Intent; import android.os.Bundle; @@ -8,11 +8,11 @@ import android.widget.Toast; import com.google.android.material.textfield.TextInputLayout; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.ui.widget.DisabledActionModeCallback; -import de.pixart.messenger.ui.widget.TextInputEditText; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.ui.widget.DisabledActionModeCallback; +import eu.siacs.conversations.ui.widget.TextInputEditText; import me.drakeet.support.toast.ToastCompat; public class ChangePasswordActivity extends XmppActivity implements XmppConnectionService.OnAccountPasswordChanged { diff --git a/src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java b/src/main/java/eu/siacs/conversations/ui/ChannelDiscoveryActivity.java similarity index 94% rename from src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java rename to src/main/java/eu/siacs/conversations/ui/ChannelDiscoveryActivity.java index ba572e8371..e94cfd92ac 100644 --- a/src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ChannelDiscoveryActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.Context; import android.content.Intent; @@ -24,18 +24,18 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.ActivityChannelDiscoveryBinding; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Bookmark; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.Room; -import de.pixart.messenger.services.ChannelDiscoveryService; -import de.pixart.messenger.ui.adapter.ChannelSearchResultAdapter; -import de.pixart.messenger.ui.util.PendingItem; -import de.pixart.messenger.ui.util.SoftKeyboardUtils; -import de.pixart.messenger.utils.AccountUtils; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.ActivityChannelDiscoveryBinding; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Bookmark; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Room; +import eu.siacs.conversations.services.ChannelDiscoveryService; +import eu.siacs.conversations.ui.adapter.ChannelSearchResultAdapter; +import eu.siacs.conversations.ui.util.PendingItem; +import eu.siacs.conversations.ui.util.SoftKeyboardUtils; +import eu.siacs.conversations.utils.AccountUtils; import me.drakeet.support.toast.ToastCompat; import rocks.xmpp.addr.Jid; diff --git a/src/main/java/de/pixart/messenger/ui/ChooseAccountForProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/ChooseAccountForProfilePictureActivity.java similarity index 94% rename from src/main/java/de/pixart/messenger/ui/ChooseAccountForProfilePictureActivity.java rename to src/main/java/eu/siacs/conversations/ui/ChooseAccountForProfilePictureActivity.java index 9f4796a836..899c3d8a94 100644 --- a/src/main/java/de/pixart/messenger/ui/ChooseAccountForProfilePictureActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ChooseAccountForProfilePictureActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.Intent; import android.net.Uri; @@ -9,9 +9,9 @@ import android.widget.Toast; import java.util.ArrayList; import java.util.List; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.ui.adapter.AccountAdapter; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.ui.adapter.AccountAdapter; import me.drakeet.support.toast.ToastCompat; public class ChooseAccountForProfilePictureActivity extends XmppActivity { diff --git a/src/main/java/de/pixart/messenger/ui/ChooseContactActivity.java b/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java similarity index 96% rename from src/main/java/de/pixart/messenger/ui/ChooseContactActivity.java rename to src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java index a79a17d83f..dacec50b78 100644 --- a/src/main/java/de/pixart/messenger/ui/ChooseContactActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.app.Activity; import android.content.Context; @@ -29,17 +29,17 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.ListItem; -import de.pixart.messenger.entities.MucOptions; -import de.pixart.messenger.ui.interfaces.OnBackendConnected; -import de.pixart.messenger.ui.util.ActivityResult; -import de.pixart.messenger.ui.util.PendingItem; -import de.pixart.messenger.utils.XmppUri; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.ListItem; +import eu.siacs.conversations.entities.MucOptions; +import eu.siacs.conversations.ui.interfaces.OnBackendConnected; +import eu.siacs.conversations.ui.util.ActivityResult; +import eu.siacs.conversations.ui.util.PendingItem; +import eu.siacs.conversations.utils.XmppUri; import rocks.xmpp.addr.Jid; public class ChooseContactActivity extends AbstractSearchableListItemActivity implements MultiChoiceModeListener, AdapterView.OnItemClickListener { diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java similarity index 95% rename from src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java rename to src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java index 87207b0cd3..866ea4ee8e 100644 --- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.app.PendingIntent; import android.content.Context; @@ -25,40 +25,40 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.ActivityMucDetailsBinding; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Bookmark; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.MucOptions; -import de.pixart.messenger.entities.MucOptions.User; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.services.XmppConnectionService.OnConversationUpdate; -import de.pixart.messenger.services.XmppConnectionService.OnMucRosterUpdate; -import de.pixart.messenger.ui.adapter.MediaAdapter; -import de.pixart.messenger.ui.adapter.UserPreviewAdapter; -import de.pixart.messenger.ui.interfaces.OnMediaLoaded; -import de.pixart.messenger.ui.util.Attachment; -import de.pixart.messenger.ui.util.AvatarWorkerTask; -import de.pixart.messenger.ui.util.GridManager; -import de.pixart.messenger.ui.util.MucConfiguration; -import de.pixart.messenger.ui.util.MucDetailsContextMenuHelper; -import de.pixart.messenger.ui.util.MyLinkify; -import de.pixart.messenger.ui.util.SoftKeyboardUtils; -import de.pixart.messenger.utils.Compatibility; -import de.pixart.messenger.utils.EmojiWrapper; -import de.pixart.messenger.utils.MenuDoubleTabUtil; -import de.pixart.messenger.utils.StringUtils; -import de.pixart.messenger.utils.StylingHelper; -import de.pixart.messenger.utils.TimeframeUtils; -import de.pixart.messenger.utils.XmppUri; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.ActivityMucDetailsBinding; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Bookmark; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.MucOptions; +import eu.siacs.conversations.entities.MucOptions.User; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.services.XmppConnectionService.OnConversationUpdate; +import eu.siacs.conversations.services.XmppConnectionService.OnMucRosterUpdate; +import eu.siacs.conversations.ui.adapter.MediaAdapter; +import eu.siacs.conversations.ui.adapter.UserPreviewAdapter; +import eu.siacs.conversations.ui.interfaces.OnMediaLoaded; +import eu.siacs.conversations.ui.util.Attachment; +import eu.siacs.conversations.ui.util.AvatarWorkerTask; +import eu.siacs.conversations.ui.util.GridManager; +import eu.siacs.conversations.ui.util.MucConfiguration; +import eu.siacs.conversations.ui.util.MucDetailsContextMenuHelper; +import eu.siacs.conversations.ui.util.MyLinkify; +import eu.siacs.conversations.ui.util.SoftKeyboardUtils; +import eu.siacs.conversations.utils.Compatibility; +import eu.siacs.conversations.utils.EmojiWrapper; +import eu.siacs.conversations.utils.MenuDoubleTabUtil; +import eu.siacs.conversations.utils.StringUtils; +import eu.siacs.conversations.utils.StylingHelper; +import eu.siacs.conversations.utils.TimeframeUtils; +import eu.siacs.conversations.utils.XmppUri; import me.drakeet.support.toast.ToastCompat; import rocks.xmpp.addr.Jid; -import static de.pixart.messenger.entities.Bookmark.printableValue; -import static de.pixart.messenger.ui.util.IntroHelper.showIntro; -import static de.pixart.messenger.utils.StringUtils.changed; +import static eu.siacs.conversations.entities.Bookmark.printableValue; +import static eu.siacs.conversations.ui.util.IntroHelper.showIntro; +import static eu.siacs.conversations.utils.StringUtils.changed; public class ConferenceDetailsActivity extends XmppActivity implements OnConversationUpdate, OnMucRosterUpdate, XmppConnectionService.OnAffiliationChanged, XmppConnectionService.OnConfigurationPushed, TextWatcher, OnMediaLoaded { public static final String ACTION_VIEW_MUC = "view_muc"; diff --git a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java similarity index 94% rename from src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java rename to src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java index 75d60baba8..4b30f6c26a 100644 --- a/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.ActivityNotFoundException; import android.content.Context; @@ -41,41 +41,41 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.crypto.axolotl.AxolotlService; -import de.pixart.messenger.crypto.axolotl.FingerprintStatus; -import de.pixart.messenger.crypto.axolotl.XmppAxolotlSession; -import de.pixart.messenger.databinding.ActivityContactDetailsBinding; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.ListItem; -import de.pixart.messenger.services.XmppConnectionService.OnAccountUpdate; -import de.pixart.messenger.services.XmppConnectionService.OnRosterUpdate; -import de.pixart.messenger.ui.adapter.MediaAdapter; -import de.pixart.messenger.ui.interfaces.OnMediaLoaded; -import de.pixart.messenger.ui.util.Attachment; -import de.pixart.messenger.ui.util.AvatarWorkerTask; -import de.pixart.messenger.ui.util.GridManager; -import de.pixart.messenger.ui.util.JidDialog; -import de.pixart.messenger.utils.Compatibility; -import de.pixart.messenger.utils.CryptoHelper; -import de.pixart.messenger.utils.EmojiWrapper; -import de.pixart.messenger.utils.Emoticons; -import de.pixart.messenger.utils.IrregularUnicodeDetector; -import de.pixart.messenger.utils.MenuDoubleTabUtil; -import de.pixart.messenger.utils.Namespace; -import de.pixart.messenger.utils.TimeframeUtils; -import de.pixart.messenger.utils.UIHelper; -import de.pixart.messenger.utils.XmppUri; -import de.pixart.messenger.xmpp.OnKeyStatusUpdated; -import de.pixart.messenger.xmpp.OnUpdateBlocklist; -import de.pixart.messenger.xmpp.XmppConnection; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.crypto.axolotl.AxolotlService; +import eu.siacs.conversations.crypto.axolotl.FingerprintStatus; +import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession; +import eu.siacs.conversations.databinding.ActivityContactDetailsBinding; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.ListItem; +import eu.siacs.conversations.services.XmppConnectionService.OnAccountUpdate; +import eu.siacs.conversations.services.XmppConnectionService.OnRosterUpdate; +import eu.siacs.conversations.ui.adapter.MediaAdapter; +import eu.siacs.conversations.ui.interfaces.OnMediaLoaded; +import eu.siacs.conversations.ui.util.Attachment; +import eu.siacs.conversations.ui.util.AvatarWorkerTask; +import eu.siacs.conversations.ui.util.GridManager; +import eu.siacs.conversations.ui.util.JidDialog; +import eu.siacs.conversations.utils.Compatibility; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.utils.EmojiWrapper; +import eu.siacs.conversations.utils.Emoticons; +import eu.siacs.conversations.utils.IrregularUnicodeDetector; +import eu.siacs.conversations.utils.MenuDoubleTabUtil; +import eu.siacs.conversations.utils.Namespace; +import eu.siacs.conversations.utils.TimeframeUtils; +import eu.siacs.conversations.utils.UIHelper; +import eu.siacs.conversations.utils.XmppUri; +import eu.siacs.conversations.xmpp.OnKeyStatusUpdated; +import eu.siacs.conversations.xmpp.OnUpdateBlocklist; +import eu.siacs.conversations.xmpp.XmppConnection; import me.drakeet.support.toast.ToastCompat; import rocks.xmpp.addr.Jid; -import static de.pixart.messenger.ui.util.IntroHelper.showIntro; +import static eu.siacs.conversations.ui.util.IntroHelper.showIntro; public class ContactDetailsActivity extends OmemoActivity implements OnAccountUpdate, OnRosterUpdate, OnUpdateBlocklist, OnKeyStatusUpdated, OnMediaLoaded { public static final String ACTION_VIEW_CONTACT = "view_contact"; diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java similarity index 97% rename from src/main/java/de/pixart/messenger/ui/ConversationFragment.java rename to src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 8354d65173..7e6b9e3ddc 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.Manifest; import android.animation.Animator; @@ -77,73 +77,73 @@ import java.util.Set; import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.crypto.axolotl.AxolotlService; -import de.pixart.messenger.crypto.axolotl.FingerprintStatus; -import de.pixart.messenger.databinding.FragmentConversationBinding; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Blockable; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.Conversational; -import de.pixart.messenger.entities.DownloadableFile; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.entities.MucOptions; -import de.pixart.messenger.entities.MucOptions.User; -import de.pixart.messenger.entities.Presence; -import de.pixart.messenger.entities.ReadByMarker; -import de.pixart.messenger.entities.Transferable; -import de.pixart.messenger.entities.TransferablePlaceholder; -import de.pixart.messenger.http.HttpDownloadConnection; -import de.pixart.messenger.persistance.FileBackend; -import de.pixart.messenger.services.MessageArchiveService; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.ui.adapter.MediaPreviewAdapter; -import de.pixart.messenger.ui.adapter.MessageAdapter; -import de.pixart.messenger.ui.util.ActivityResult; -import de.pixart.messenger.ui.util.Attachment; -import de.pixart.messenger.ui.util.AvatarWorkerTask; -import de.pixart.messenger.ui.util.ConversationMenuConfigurator; -import de.pixart.messenger.ui.util.DateSeparator; -import de.pixart.messenger.ui.util.EditMessageActionModeCallback; -import de.pixart.messenger.ui.util.ListViewUtils; -import de.pixart.messenger.ui.util.MucDetailsContextMenuHelper; -import de.pixart.messenger.ui.util.PendingItem; -import de.pixart.messenger.ui.util.PresenceSelector; -import de.pixart.messenger.ui.util.ScrollState; -import de.pixart.messenger.ui.util.SendButtonAction; -import de.pixart.messenger.ui.util.SendButtonTool; -import de.pixart.messenger.ui.util.ShareUtil; -import de.pixart.messenger.ui.util.StyledAttributes; -import de.pixart.messenger.ui.util.ViewUtil; -import de.pixart.messenger.ui.widget.EditMessage; -import de.pixart.messenger.utils.Compatibility; -import de.pixart.messenger.utils.GeoHelper; -import de.pixart.messenger.utils.MenuDoubleTabUtil; -import de.pixart.messenger.utils.MessageUtils; -import de.pixart.messenger.utils.NickValidityChecker; -import de.pixart.messenger.utils.Patterns; -import de.pixart.messenger.utils.QuickLoader; -import de.pixart.messenger.utils.StylingHelper; -import de.pixart.messenger.utils.UIHelper; -import de.pixart.messenger.xmpp.XmppConnection; -import de.pixart.messenger.xmpp.chatstate.ChatState; -import de.pixart.messenger.xmpp.jingle.JingleConnection; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.crypto.axolotl.AxolotlService; +import eu.siacs.conversations.crypto.axolotl.FingerprintStatus; +import eu.siacs.conversations.databinding.FragmentConversationBinding; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Blockable; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Conversational; +import eu.siacs.conversations.entities.DownloadableFile; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.entities.MucOptions; +import eu.siacs.conversations.entities.MucOptions.User; +import eu.siacs.conversations.entities.Presence; +import eu.siacs.conversations.entities.ReadByMarker; +import eu.siacs.conversations.entities.Transferable; +import eu.siacs.conversations.entities.TransferablePlaceholder; +import eu.siacs.conversations.http.HttpDownloadConnection; +import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.services.MessageArchiveService; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.ui.adapter.MediaPreviewAdapter; +import eu.siacs.conversations.ui.adapter.MessageAdapter; +import eu.siacs.conversations.ui.util.ActivityResult; +import eu.siacs.conversations.ui.util.Attachment; +import eu.siacs.conversations.ui.util.AvatarWorkerTask; +import eu.siacs.conversations.ui.util.ConversationMenuConfigurator; +import eu.siacs.conversations.ui.util.DateSeparator; +import eu.siacs.conversations.ui.util.EditMessageActionModeCallback; +import eu.siacs.conversations.ui.util.ListViewUtils; +import eu.siacs.conversations.ui.util.MucDetailsContextMenuHelper; +import eu.siacs.conversations.ui.util.PendingItem; +import eu.siacs.conversations.ui.util.PresenceSelector; +import eu.siacs.conversations.ui.util.ScrollState; +import eu.siacs.conversations.ui.util.SendButtonAction; +import eu.siacs.conversations.ui.util.SendButtonTool; +import eu.siacs.conversations.ui.util.ShareUtil; +import eu.siacs.conversations.ui.util.StyledAttributes; +import eu.siacs.conversations.ui.util.ViewUtil; +import eu.siacs.conversations.ui.widget.EditMessage; +import eu.siacs.conversations.utils.Compatibility; +import eu.siacs.conversations.utils.GeoHelper; +import eu.siacs.conversations.utils.MenuDoubleTabUtil; +import eu.siacs.conversations.utils.MessageUtils; +import eu.siacs.conversations.utils.NickValidityChecker; +import eu.siacs.conversations.utils.Patterns; +import eu.siacs.conversations.utils.QuickLoader; +import eu.siacs.conversations.utils.StylingHelper; +import eu.siacs.conversations.utils.UIHelper; +import eu.siacs.conversations.xmpp.XmppConnection; +import eu.siacs.conversations.xmpp.chatstate.ChatState; +import eu.siacs.conversations.xmpp.jingle.JingleConnection; import me.drakeet.support.toast.ToastCompat; import rocks.xmpp.addr.Jid; -import static de.pixart.messenger.entities.Message.DELETED_MESSAGE_BODY; -import static de.pixart.messenger.ui.SettingsActivity.HIDE_YOU_ARE_NOT_PARTICIPATING; -import static de.pixart.messenger.ui.SettingsActivity.WARN_UNENCRYPTED_CHAT; -import static de.pixart.messenger.ui.XmppActivity.EXTRA_ACCOUNT; -import static de.pixart.messenger.ui.XmppActivity.REQUEST_INVITE_TO_CONVERSATION; -import static de.pixart.messenger.ui.util.SoftKeyboardUtils.hideSoftKeyboard; -import static de.pixart.messenger.utils.Compatibility.runsTwentyOne; -import static de.pixart.messenger.utils.PermissionUtils.allGranted; -import static de.pixart.messenger.utils.PermissionUtils.getFirstDenied; -import static de.pixart.messenger.utils.PermissionUtils.readGranted; -import static de.pixart.messenger.xmpp.Patches.ENCRYPTION_EXCEPTIONS; +import static eu.siacs.conversations.entities.Message.DELETED_MESSAGE_BODY; +import static eu.siacs.conversations.ui.SettingsActivity.HIDE_YOU_ARE_NOT_PARTICIPATING; +import static eu.siacs.conversations.ui.SettingsActivity.WARN_UNENCRYPTED_CHAT; +import static eu.siacs.conversations.ui.XmppActivity.EXTRA_ACCOUNT; +import static eu.siacs.conversations.ui.XmppActivity.REQUEST_INVITE_TO_CONVERSATION; +import static eu.siacs.conversations.ui.util.SoftKeyboardUtils.hideSoftKeyboard; +import static eu.siacs.conversations.utils.Compatibility.runsTwentyOne; +import static eu.siacs.conversations.utils.PermissionUtils.allGranted; +import static eu.siacs.conversations.utils.PermissionUtils.getFirstDenied; +import static eu.siacs.conversations.utils.PermissionUtils.readGranted; +import static eu.siacs.conversations.xmpp.Patches.ENCRYPTION_EXCEPTIONS; public class ConversationFragment extends XmppFragment implements EditMessage.KeyboardListener, MessageAdapter.OnContactPictureLongClicked, MessageAdapter.OnContactPictureClicked { diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java similarity index 95% rename from src/main/java/de/pixart/messenger/ui/ConversationsActivity.java rename to src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java index fd2e0a1d65..659e4067ff 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.annotation.SuppressLint; import android.app.Activity; @@ -68,49 +68,49 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.crypto.OmemoSetting; -import de.pixart.messenger.databinding.ActivityConversationsBinding; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.Conversational; -import de.pixart.messenger.entities.MucOptions; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.ui.interfaces.OnBackendConnected; -import de.pixart.messenger.ui.interfaces.OnConversationArchived; -import de.pixart.messenger.ui.interfaces.OnConversationRead; -import de.pixart.messenger.ui.interfaces.OnConversationSelected; -import de.pixart.messenger.ui.interfaces.OnConversationsListItemUpdated; -import de.pixart.messenger.ui.util.ActivityResult; -import de.pixart.messenger.ui.util.ConversationMenuConfigurator; -import de.pixart.messenger.ui.util.IntroHelper; -import de.pixart.messenger.ui.util.PendingItem; -import de.pixart.messenger.utils.EmojiWrapper; -import de.pixart.messenger.utils.ExceptionHelper; -import de.pixart.messenger.utils.MenuDoubleTabUtil; -import de.pixart.messenger.utils.Namespace; -import de.pixart.messenger.utils.SignupUtils; -import de.pixart.messenger.utils.UIHelper; -import de.pixart.messenger.utils.XmppUri; -import de.pixart.messenger.xmpp.OnUpdateBlocklist; -import de.pixart.messenger.xmpp.chatstate.ChatState; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.crypto.OmemoSetting; +import eu.siacs.conversations.databinding.ActivityConversationsBinding; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Conversational; +import eu.siacs.conversations.entities.MucOptions; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.ui.interfaces.OnBackendConnected; +import eu.siacs.conversations.ui.interfaces.OnConversationArchived; +import eu.siacs.conversations.ui.interfaces.OnConversationRead; +import eu.siacs.conversations.ui.interfaces.OnConversationSelected; +import eu.siacs.conversations.ui.interfaces.OnConversationsListItemUpdated; +import eu.siacs.conversations.ui.util.ActivityResult; +import eu.siacs.conversations.ui.util.ConversationMenuConfigurator; +import eu.siacs.conversations.ui.util.IntroHelper; +import eu.siacs.conversations.ui.util.PendingItem; +import eu.siacs.conversations.utils.EmojiWrapper; +import eu.siacs.conversations.utils.ExceptionHelper; +import eu.siacs.conversations.utils.MenuDoubleTabUtil; +import eu.siacs.conversations.utils.Namespace; +import eu.siacs.conversations.utils.SignupUtils; +import eu.siacs.conversations.utils.UIHelper; +import eu.siacs.conversations.utils.XmppUri; +import eu.siacs.conversations.xmpp.OnUpdateBlocklist; +import eu.siacs.conversations.xmpp.chatstate.ChatState; import me.drakeet.support.toast.ToastCompat; import rocks.xmpp.addr.Jid; -import static de.pixart.messenger.ui.ConversationFragment.REQUEST_DECRYPT_PGP; +import static eu.siacs.conversations.ui.ConversationFragment.REQUEST_DECRYPT_PGP; public class ConversationsActivity extends XmppActivity implements OnConversationSelected, OnConversationArchived, OnConversationsListItemUpdated, OnConversationRead, XmppConnectionService.OnAccountUpdate, XmppConnectionService.OnConversationUpdate, XmppConnectionService.OnRosterUpdate, OnUpdateBlocklist, XmppConnectionService.OnShowErrorToast, XmppConnectionService.OnAffiliationChanged, XmppConnectionService.OnRoomDestroy { - public static final String ACTION_VIEW_CONVERSATION = "de.pixart.messenger.VIEW"; + public static final String ACTION_VIEW_CONVERSATION = "eu.siacs.conversations.VIEW"; public static final String EXTRA_CONVERSATION = "conversationUuid"; - public static final String EXTRA_DOWNLOAD_UUID = "de.pixart.messenger.download_uuid"; - public static final String EXTRA_AS_QUOTE = "de.pixart.messenger.as_quote"; + public static final String EXTRA_DOWNLOAD_UUID = "eu.siacs.conversations.download_uuid"; + public static final String EXTRA_AS_QUOTE = "eu.siacs.conversations.as_quote"; public static final String EXTRA_NICK = "nick"; public static final String EXTRA_USER = "user"; public static final String EXTRA_IS_PRIVATE_MESSAGE = "pm"; public static final String EXTRA_DO_NOT_APPEND = "do_not_append"; - public static final String ACTION_DESTROY_MUC = "de.pixart.messenger.DESTROY_MUC"; + public static final String ACTION_DESTROY_MUC = "eu.siacs.conversations.DESTROY_MUC"; public static final int REQUEST_OPEN_MESSAGE = 0x9876; public static final int REQUEST_PLAY_PAUSE = 0x5432; private static List VIEW_AND_SHARE_ACTIONS = Arrays.asList( diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsOverviewFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java similarity index 94% rename from src/main/java/de/pixart/messenger/ui/ConversationsOverviewFragment.java rename to src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java index ff5154b653..2cc25e9b6e 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationsOverviewFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.animation.Animator; import android.animation.AnimatorInflater; @@ -49,16 +49,16 @@ import androidx.recyclerview.widget.LinearLayoutManager; import java.util.ArrayList; import java.util.List; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.FragmentConversationsOverviewBinding; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.ui.adapter.ConversationAdapter; -import de.pixart.messenger.ui.interfaces.OnConversationSelected; -import de.pixart.messenger.ui.util.PendingActionHelper; -import de.pixart.messenger.ui.util.PendingItem; -import de.pixart.messenger.ui.util.ScrollState; -import de.pixart.messenger.utils.MenuDoubleTabUtil; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.FragmentConversationsOverviewBinding; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.ui.adapter.ConversationAdapter; +import eu.siacs.conversations.ui.interfaces.OnConversationSelected; +import eu.siacs.conversations.ui.util.PendingActionHelper; +import eu.siacs.conversations.ui.util.PendingItem; +import eu.siacs.conversations.ui.util.ScrollState; +import eu.siacs.conversations.utils.MenuDoubleTabUtil; public class ConversationsOverviewFragment extends XmppFragment { diff --git a/src/main/java/de/pixart/messenger/ui/CreatePrivateGroupChatDialog.java b/src/main/java/eu/siacs/conversations/ui/CreatePrivateGroupChatDialog.java similarity index 93% rename from src/main/java/de/pixart/messenger/ui/CreatePrivateGroupChatDialog.java rename to src/main/java/eu/siacs/conversations/ui/CreatePrivateGroupChatDialog.java index 1df39d0a8a..160a0f27cf 100644 --- a/src/main/java/de/pixart/messenger/ui/CreatePrivateGroupChatDialog.java +++ b/src/main/java/eu/siacs/conversations/ui/CreatePrivateGroupChatDialog.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.app.Dialog; import android.content.Context; @@ -14,10 +14,10 @@ import androidx.fragment.app.DialogFragment; import java.util.ArrayList; import java.util.List; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.CreateConferenceDialogBinding; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.ui.util.DelayedHintHelper; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.CreateConferenceDialogBinding; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.ui.util.DelayedHintHelper; public class CreatePrivateGroupChatDialog extends DialogFragment { diff --git a/src/main/java/de/pixart/messenger/ui/CreatePublicChannelDialog.java b/src/main/java/eu/siacs/conversations/ui/CreatePublicChannelDialog.java similarity index 95% rename from src/main/java/de/pixart/messenger/ui/CreatePublicChannelDialog.java rename to src/main/java/eu/siacs/conversations/ui/CreatePublicChannelDialog.java index 02e44698e7..9d85d35476 100644 --- a/src/main/java/de/pixart/messenger/ui/CreatePublicChannelDialog.java +++ b/src/main/java/eu/siacs/conversations/ui/CreatePublicChannelDialog.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.app.Activity; import android.app.Dialog; @@ -22,15 +22,15 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.CreatePublicChannelDialogBinding; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.ui.adapter.KnownHostsAdapter; -import de.pixart.messenger.ui.interfaces.OnBackendConnected; -import de.pixart.messenger.ui.util.DelayedHintHelper; -import de.pixart.messenger.utils.CryptoHelper; -import de.pixart.messenger.xmpp.XmppConnection; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.CreatePublicChannelDialogBinding; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.ui.adapter.KnownHostsAdapter; +import eu.siacs.conversations.ui.interfaces.OnBackendConnected; +import eu.siacs.conversations.ui.util.DelayedHintHelper; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.xmpp.XmppConnection; import rocks.xmpp.addr.Jid; public class CreatePublicChannelDialog extends DialogFragment implements OnBackendConnected { diff --git a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java similarity index 97% rename from src/main/java/de/pixart/messenger/ui/EditAccountActivity.java rename to src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java index a6ab04be29..1d7a23bcb0 100644 --- a/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.app.Activity; import android.app.PendingIntent; @@ -46,44 +46,44 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.crypto.axolotl.AxolotlService; -import de.pixart.messenger.crypto.axolotl.XmppAxolotlSession; -import de.pixart.messenger.databinding.ActivityEditAccountBinding; -import de.pixart.messenger.databinding.DialogPresenceBinding; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Presence; -import de.pixart.messenger.entities.PresenceTemplate; -import de.pixart.messenger.services.BarcodeProvider; -import de.pixart.messenger.services.QuickConversationsService; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.services.XmppConnectionService.OnAccountUpdate; -import de.pixart.messenger.services.XmppConnectionService.OnCaptchaRequested; -import de.pixart.messenger.ui.adapter.KnownHostsAdapter; -import de.pixart.messenger.ui.adapter.PresenceTemplateAdapter; -import de.pixart.messenger.ui.util.AvatarWorkerTask; -import de.pixart.messenger.ui.util.PendingItem; -import de.pixart.messenger.ui.util.SoftKeyboardUtils; -import de.pixart.messenger.utils.CryptoHelper; -import de.pixart.messenger.utils.MenuDoubleTabUtil; -import de.pixart.messenger.utils.Resolver; -import de.pixart.messenger.utils.SignupUtils; -import de.pixart.messenger.utils.TorServiceUtils; -import de.pixart.messenger.utils.UIHelper; -import de.pixart.messenger.utils.XmppUri; -import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xmpp.OnKeyStatusUpdated; -import de.pixart.messenger.xmpp.OnUpdateBlocklist; -import de.pixart.messenger.xmpp.XmppConnection; -import de.pixart.messenger.xmpp.XmppConnection.Features; -import de.pixart.messenger.xmpp.forms.Data; -import de.pixart.messenger.xmpp.pep.Avatar; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.crypto.axolotl.AxolotlService; +import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession; +import eu.siacs.conversations.databinding.ActivityEditAccountBinding; +import eu.siacs.conversations.databinding.DialogPresenceBinding; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Presence; +import eu.siacs.conversations.entities.PresenceTemplate; +import eu.siacs.conversations.services.BarcodeProvider; +import eu.siacs.conversations.services.QuickConversationsService; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.services.XmppConnectionService.OnAccountUpdate; +import eu.siacs.conversations.services.XmppConnectionService.OnCaptchaRequested; +import eu.siacs.conversations.ui.adapter.KnownHostsAdapter; +import eu.siacs.conversations.ui.adapter.PresenceTemplateAdapter; +import eu.siacs.conversations.ui.util.AvatarWorkerTask; +import eu.siacs.conversations.ui.util.PendingItem; +import eu.siacs.conversations.ui.util.SoftKeyboardUtils; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.utils.MenuDoubleTabUtil; +import eu.siacs.conversations.utils.Resolver; +import eu.siacs.conversations.utils.SignupUtils; +import eu.siacs.conversations.utils.TorServiceUtils; +import eu.siacs.conversations.utils.UIHelper; +import eu.siacs.conversations.utils.XmppUri; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.OnKeyStatusUpdated; +import eu.siacs.conversations.xmpp.OnUpdateBlocklist; +import eu.siacs.conversations.xmpp.XmppConnection; +import eu.siacs.conversations.xmpp.XmppConnection.Features; +import eu.siacs.conversations.xmpp.forms.Data; +import eu.siacs.conversations.xmpp.pep.Avatar; import me.drakeet.support.toast.ToastCompat; import rocks.xmpp.addr.Jid; -import static de.pixart.messenger.utils.PermissionUtils.allGranted; -import static de.pixart.messenger.utils.PermissionUtils.readGranted; +import static eu.siacs.conversations.utils.PermissionUtils.allGranted; +import static eu.siacs.conversations.utils.PermissionUtils.readGranted; public class EditAccountActivity extends OmemoActivity implements OnAccountUpdate, OnUpdateBlocklist, OnKeyStatusUpdated, OnCaptchaRequested, KeyChainAliasCallback, XmppConnectionService.OnShowErrorToast, XmppConnectionService.OnMamPreferencesFetched { diff --git a/src/main/java/de/pixart/messenger/ui/EnterJidDialog.java b/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java similarity index 96% rename from src/main/java/de/pixart/messenger/ui/EnterJidDialog.java rename to src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java index 6a7b1e98b6..6ca0b76a00 100644 --- a/src/main/java/de/pixart/messenger/ui/EnterJidDialog.java +++ b/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.app.Activity; import android.app.Dialog; @@ -19,12 +19,12 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.EnterJidDialogBinding; -import de.pixart.messenger.ui.adapter.KnownHostsAdapter; -import de.pixart.messenger.ui.interfaces.OnBackendConnected; -import de.pixart.messenger.ui.util.DelayedHintHelper; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.EnterJidDialogBinding; +import eu.siacs.conversations.ui.adapter.KnownHostsAdapter; +import eu.siacs.conversations.ui.interfaces.OnBackendConnected; +import eu.siacs.conversations.ui.util.DelayedHintHelper; import rocks.xmpp.addr.Jid; public class EnterJidDialog extends DialogFragment implements OnBackendConnected, TextWatcher { diff --git a/src/main/java/de/pixart/messenger/ui/EnterNameActivity.java b/src/main/java/eu/siacs/conversations/ui/EnterNameActivity.java similarity index 92% rename from src/main/java/de/pixart/messenger/ui/EnterNameActivity.java rename to src/main/java/eu/siacs/conversations/ui/EnterNameActivity.java index f0b1a93aaa..b1f5eec4f8 100644 --- a/src/main/java/de/pixart/messenger/ui/EnterNameActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/EnterNameActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.Intent; import android.os.Bundle; @@ -9,11 +9,11 @@ import androidx.databinding.DataBindingUtil; import java.util.concurrent.atomic.AtomicBoolean; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.ActivityEnterNameBinding; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.utils.FirstStartManager; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.ActivityEnterNameBinding; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.utils.FirstStartManager; public class EnterNameActivity extends XmppActivity implements XmppConnectionService.OnAccountUpdate { diff --git a/src/main/java/de/pixart/messenger/ui/ImportBackupActivity.java b/src/main/java/eu/siacs/conversations/ui/ImportBackupActivity.java similarity index 95% rename from src/main/java/de/pixart/messenger/ui/ImportBackupActivity.java rename to src/main/java/eu/siacs/conversations/ui/ImportBackupActivity.java index ef9b7eec16..27a2b70a7b 100644 --- a/src/main/java/de/pixart/messenger/ui/ImportBackupActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ImportBackupActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.ComponentName; import android.content.Context; @@ -25,13 +25,13 @@ import com.google.android.material.snackbar.Snackbar; import java.io.IOException; import java.util.List; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.ActivityImportBackupBinding; -import de.pixart.messenger.databinding.DialogEnterPasswordBinding; -import de.pixart.messenger.services.ImportBackupService; -import de.pixart.messenger.ui.adapter.BackupFileAdapter; -import de.pixart.messenger.utils.ThemeHelper; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.ActivityImportBackupBinding; +import eu.siacs.conversations.databinding.DialogEnterPasswordBinding; +import eu.siacs.conversations.services.ImportBackupService; +import eu.siacs.conversations.ui.adapter.BackupFileAdapter; +import eu.siacs.conversations.utils.ThemeHelper; public class ImportBackupActivity extends XmppActivity implements ServiceConnection, ImportBackupService.OnBackupFilesLoaded, BackupFileAdapter.OnItemClickedListener, ImportBackupService.OnBackupProcessed { diff --git a/src/main/java/de/pixart/messenger/ui/IntroActivity.java b/src/main/java/eu/siacs/conversations/ui/IntroActivity.java similarity index 98% rename from src/main/java/de/pixart/messenger/ui/IntroActivity.java rename to src/main/java/eu/siacs/conversations/ui/IntroActivity.java index da2b29e143..c206edf0c7 100644 --- a/src/main/java/de/pixart/messenger/ui/IntroActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/IntroActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.Intent; import android.os.Bundle; @@ -10,9 +10,9 @@ import com.github.paolorotolo.appintro.AppIntro; import com.github.paolorotolo.appintro.AppIntroFragment; import com.github.paolorotolo.appintro.model.SliderPage; -import de.pixart.messenger.R; +import eu.siacs.conversations.R; -import static de.pixart.messenger.ui.util.IntroHelper.SaveIntroShown; +import static eu.siacs.conversations.ui.util.IntroHelper.SaveIntroShown; public class IntroActivity extends AppIntro { public static final String ACTIVITY = "activity"; diff --git a/src/main/java/de/pixart/messenger/ui/JoinConferenceDialog.java b/src/main/java/eu/siacs/conversations/ui/JoinConferenceDialog.java similarity index 94% rename from src/main/java/de/pixart/messenger/ui/JoinConferenceDialog.java rename to src/main/java/eu/siacs/conversations/ui/JoinConferenceDialog.java index a019832adc..0fc1fe6fee 100644 --- a/src/main/java/de/pixart/messenger/ui/JoinConferenceDialog.java +++ b/src/main/java/eu/siacs/conversations/ui/JoinConferenceDialog.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.app.Activity; import android.app.Dialog; @@ -20,11 +20,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.DialogJoinConferenceBinding; -import de.pixart.messenger.ui.adapter.KnownHostsAdapter; -import de.pixart.messenger.ui.interfaces.OnBackendConnected; -import de.pixart.messenger.ui.util.DelayedHintHelper; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.DialogJoinConferenceBinding; +import eu.siacs.conversations.ui.adapter.KnownHostsAdapter; +import eu.siacs.conversations.ui.interfaces.OnBackendConnected; +import eu.siacs.conversations.ui.util.DelayedHintHelper; public class JoinConferenceDialog extends DialogFragment implements OnBackendConnected { diff --git a/src/main/java/de/pixart/messenger/ui/LocationActivity.java b/src/main/java/eu/siacs/conversations/ui/LocationActivity.java similarity index 97% rename from src/main/java/de/pixart/messenger/ui/LocationActivity.java rename to src/main/java/eu/siacs/conversations/ui/LocationActivity.java index 5775785535..8b3dce4fdd 100644 --- a/src/main/java/de/pixart/messenger/ui/LocationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/LocationActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.Manifest; import android.content.Context; @@ -10,7 +10,7 @@ import android.os.Bundle; import androidx.core.app.ActivityCompat; -import de.pixart.messenger.Config; +import eu.siacs.conversations.Config; public abstract class LocationActivity extends XmppActivity implements LocationListener { private LocationManager locationManager; diff --git a/src/main/java/de/pixart/messenger/ui/MagicCreateActivity.java b/src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java similarity index 96% rename from src/main/java/de/pixart/messenger/ui/MagicCreateActivity.java rename to src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java index 78f7ec11ea..950e990e14 100644 --- a/src/main/java/de/pixart/messenger/ui/MagicCreateActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.Intent; import android.content.pm.ActivityInfo; @@ -19,12 +19,12 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.ActivityMagicCreateBinding; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.utils.CryptoHelper; -import de.pixart.messenger.utils.InstallReferrerUtils; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.ActivityMagicCreateBinding; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.utils.InstallReferrerUtils; import rocks.xmpp.addr.Jid; public class MagicCreateActivity extends XmppActivity implements TextWatcher, AdapterView.OnItemSelectedListener, CompoundButton.OnCheckedChangeListener { diff --git a/src/main/java/de/pixart/messenger/ui/ManageAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java similarity index 96% rename from src/main/java/de/pixart/messenger/ui/ManageAccountActivity.java rename to src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java index b06fec0047..81a6895fcf 100644 --- a/src/main/java/de/pixart/messenger/ui/ManageAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.ActivityNotFoundException; import android.content.Intent; @@ -25,19 +25,19 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.services.XmppConnectionService.OnAccountUpdate; -import de.pixart.messenger.ui.adapter.AccountAdapter; -import de.pixart.messenger.utils.MenuDoubleTabUtil; -import de.pixart.messenger.xmpp.XmppConnection; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.services.XmppConnectionService.OnAccountUpdate; +import eu.siacs.conversations.ui.adapter.AccountAdapter; +import eu.siacs.conversations.utils.MenuDoubleTabUtil; +import eu.siacs.conversations.xmpp.XmppConnection; import me.drakeet.support.toast.ToastCompat; import rocks.xmpp.addr.Jid; -import static de.pixart.messenger.utils.PermissionUtils.allGranted; -import static de.pixart.messenger.utils.PermissionUtils.readGranted; +import static eu.siacs.conversations.utils.PermissionUtils.allGranted; +import static eu.siacs.conversations.utils.PermissionUtils.readGranted; public class ManageAccountActivity extends XmppActivity implements OnAccountUpdate, KeyChainAliasCallback, XmppConnectionService.OnAccountCreated, AccountAdapter.OnTglAccountState { diff --git a/src/main/java/de/pixart/messenger/ui/MediaBrowserActivity.java b/src/main/java/eu/siacs/conversations/ui/MediaBrowserActivity.java similarity index 92% rename from src/main/java/de/pixart/messenger/ui/MediaBrowserActivity.java rename to src/main/java/eu/siacs/conversations/ui/MediaBrowserActivity.java index b75af44e96..9daf8e90f8 100644 --- a/src/main/java/de/pixart/messenger/ui/MediaBrowserActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/MediaBrowserActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.Context; import android.content.Intent; @@ -14,17 +14,17 @@ import androidx.databinding.DataBindingUtil; import java.util.ArrayList; import java.util.List; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.ActivityMediaBrowserBinding; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.ui.adapter.MediaAdapter; -import de.pixart.messenger.ui.interfaces.OnMediaLoaded; -import de.pixart.messenger.ui.util.Attachment; -import de.pixart.messenger.ui.util.GridManager; -import de.pixart.messenger.utils.MenuDoubleTabUtil; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.ActivityMediaBrowserBinding; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.ui.adapter.MediaAdapter; +import eu.siacs.conversations.ui.interfaces.OnMediaLoaded; +import eu.siacs.conversations.ui.util.Attachment; +import eu.siacs.conversations.ui.util.GridManager; +import eu.siacs.conversations.utils.MenuDoubleTabUtil; import rocks.xmpp.addr.Jid; diff --git a/src/main/java/de/pixart/messenger/ui/MediaViewerActivity.java b/src/main/java/eu/siacs/conversations/ui/MediaViewerActivity.java similarity index 97% rename from src/main/java/de/pixart/messenger/ui/MediaViewerActivity.java rename to src/main/java/eu/siacs/conversations/ui/MediaViewerActivity.java index 8fe8f18ed9..f5f3f7ee6d 100644 --- a/src/main/java/de/pixart/messenger/ui/MediaViewerActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/MediaViewerActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.ActivityNotFoundException; import android.content.Context; @@ -44,15 +44,16 @@ import java.io.FileNotFoundException; import java.io.InputStream; import java.util.List; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.ActivityMediaViewerBinding; -import de.pixart.messenger.persistance.FileBackend; -import de.pixart.messenger.utils.ExifHelper; -import de.pixart.messenger.utils.MimeUtils; +import eu.siacs.conversations.BuildConfig; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.ActivityMediaViewerBinding; +import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.utils.ExifHelper; +import eu.siacs.conversations.utils.MimeUtils; import me.drakeet.support.toast.ToastCompat; -import static de.pixart.messenger.persistance.FileBackend.close; +import static eu.siacs.conversations.persistance.FileBackend.close; public class MediaViewerActivity extends XmppActivity implements AudioManager.OnAudioFocusChangeListener { @@ -323,7 +324,7 @@ public class MediaViewerActivity extends XmppActivity implements AudioManager.On }); player.setRepeatMode(Player.REPEAT_MODE_OFF); binding.messageVideoView.setPlayer(player); - DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(this, Util.getUserAgent(this, "de.pixart.messenger")); + DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(this, Util.getUserAgent(this, BuildConfig.APPLICATION_ID)); MediaSource videoSource = new ProgressiveMediaSource.Factory(dataSourceFactory).createMediaSource(uri); player.prepare(videoSource); requestAudioFocus(); diff --git a/src/main/java/de/pixart/messenger/ui/MemorizingActivity.java b/src/main/java/eu/siacs/conversations/ui/MemorizingActivity.java similarity index 94% rename from src/main/java/de/pixart/messenger/ui/MemorizingActivity.java rename to src/main/java/eu/siacs/conversations/ui/MemorizingActivity.java index fad44d913c..6dfc505a8b 100644 --- a/src/main/java/de/pixart/messenger/ui/MemorizingActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/MemorizingActivity.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.DialogInterface; import android.content.DialogInterface.OnCancelListener; @@ -35,10 +35,10 @@ import androidx.appcompat.app.AppCompatActivity; import java.util.logging.Level; import java.util.logging.Logger; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.MTMDecision; -import de.pixart.messenger.services.MemorizingTrustManager; -import de.pixart.messenger.utils.ThemeHelper; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.MTMDecision; +import eu.siacs.conversations.services.MemorizingTrustManager; +import eu.siacs.conversations.utils.ThemeHelper; public class MemorizingActivity extends AppCompatActivity implements OnClickListener,OnCancelListener { diff --git a/src/main/java/de/pixart/messenger/ui/MucUsersActivity.java b/src/main/java/eu/siacs/conversations/ui/MucUsersActivity.java similarity index 91% rename from src/main/java/de/pixart/messenger/ui/MucUsersActivity.java rename to src/main/java/eu/siacs/conversations/ui/MucUsersActivity.java index 806e32743c..c702f29230 100644 --- a/src/main/java/de/pixart/messenger/ui/MucUsersActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/MucUsersActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.Context; import android.content.Intent; @@ -20,14 +20,14 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Locale; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.ActivityMucUsersBinding; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.MucOptions; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.ui.adapter.UserAdapter; -import de.pixart.messenger.ui.util.MucDetailsContextMenuHelper; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.ActivityMucUsersBinding; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.MucOptions; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.ui.adapter.UserAdapter; +import eu.siacs.conversations.ui.util.MucDetailsContextMenuHelper; import me.drakeet.support.toast.ToastCompat; import rocks.xmpp.addr.Jid; diff --git a/src/main/java/de/pixart/messenger/ui/OmemoActivity.java b/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java similarity index 95% rename from src/main/java/de/pixart/messenger/ui/OmemoActivity.java rename to src/main/java/eu/siacs/conversations/ui/OmemoActivity.java index fb63a7a861..30ff475cb4 100644 --- a/src/main/java/de/pixart/messenger/ui/OmemoActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.Intent; @@ -12,14 +12,14 @@ import android.widget.Toast; import androidx.appcompat.app.AlertDialog; import androidx.databinding.DataBindingUtil; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.crypto.axolotl.FingerprintStatus; -import de.pixart.messenger.crypto.axolotl.XmppAxolotlSession; -import de.pixart.messenger.databinding.ContactKeyBinding; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.utils.CryptoHelper; -import de.pixart.messenger.utils.XmppUri; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.crypto.axolotl.FingerprintStatus; +import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession; +import eu.siacs.conversations.databinding.ContactKeyBinding; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.utils.XmppUri; import me.drakeet.support.toast.ToastCompat; public abstract class OmemoActivity extends XmppActivity { diff --git a/src/main/java/de/pixart/messenger/ui/PublishGroupChatProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java similarity index 92% rename from src/main/java/de/pixart/messenger/ui/PublishGroupChatProfilePictureActivity.java rename to src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java index fc0d34beb6..08687d5d06 100644 --- a/src/main/java/de/pixart/messenger/ui/PublishGroupChatProfilePictureActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/PublishGroupChatProfilePictureActivity.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.Intent; import android.graphics.Bitmap; @@ -43,15 +43,15 @@ import androidx.databinding.DataBindingUtil; import com.theartofdev.edmodo.cropper.CropImage; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.ActivityPublishProfilePictureBinding; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.ui.interfaces.OnAvatarPublication; -import de.pixart.messenger.ui.util.PendingItem; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.ActivityPublishProfilePictureBinding; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.ui.interfaces.OnAvatarPublication; +import eu.siacs.conversations.ui.util.PendingItem; import me.drakeet.support.toast.ToastCompat; -import static de.pixart.messenger.ui.PublishProfilePictureActivity.REQUEST_CHOOSE_PICTURE; +import static eu.siacs.conversations.ui.PublishProfilePictureActivity.REQUEST_CHOOSE_PICTURE; public class PublishGroupChatProfilePictureActivity extends XmppActivity implements OnAvatarPublication { diff --git a/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java similarity index 96% rename from src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java rename to src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java index 0c634d8f38..0908fe6c03 100644 --- a/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.app.Activity; import android.content.Intent; @@ -20,12 +20,12 @@ import com.theartofdev.edmodo.cropper.CropImage; import java.util.concurrent.atomic.AtomicBoolean; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.ui.interfaces.OnAvatarPublication; -import de.pixart.messenger.utils.PhoneHelper; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.ui.interfaces.OnAvatarPublication; +import eu.siacs.conversations.utils.PhoneHelper; import me.drakeet.support.toast.ToastCompat; public class PublishProfilePictureActivity extends XmppActivity implements XmppConnectionService.OnAccountUpdate, OnAvatarPublication { diff --git a/src/main/java/de/pixart/messenger/ui/RecordingActivity.java b/src/main/java/eu/siacs/conversations/ui/RecordingActivity.java similarity index 96% rename from src/main/java/de/pixart/messenger/ui/RecordingActivity.java rename to src/main/java/eu/siacs/conversations/ui/RecordingActivity.java index 1b1ea64c24..1ef9dbfb71 100644 --- a/src/main/java/de/pixart/messenger/ui/RecordingActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/RecordingActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.annotation.SuppressLint; import android.app.Activity; @@ -27,11 +27,11 @@ import java.util.Locale; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.ActivityRecordingBinding; -import de.pixart.messenger.persistance.FileBackend; -import de.pixart.messenger.utils.ThemeHelper; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.ActivityRecordingBinding; +import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.utils.ThemeHelper; import me.drakeet.support.toast.ToastCompat; public class RecordingActivity extends AppCompatActivity implements View.OnClickListener { diff --git a/src/main/java/de/pixart/messenger/ui/ScanActivity.java b/src/main/java/eu/siacs/conversations/ui/ScanActivity.java similarity index 98% rename from src/main/java/de/pixart/messenger/ui/ScanActivity.java rename to src/main/java/eu/siacs/conversations/ui/ScanActivity.java index 821fda7001..7b44d358c9 100644 --- a/src/main/java/de/pixart/messenger/ui/ScanActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ScanActivity.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.Manifest; import android.app.Activity; @@ -57,10 +57,10 @@ import com.google.zxing.qrcode.QRCodeReader; import java.util.EnumMap; import java.util.Map; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.ui.service.CameraManager; -import de.pixart.messenger.ui.widget.ScannerView; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.ui.service.CameraManager; +import eu.siacs.conversations.ui.widget.ScannerView; import me.drakeet.support.toast.ToastCompat; /** diff --git a/src/main/java/de/pixart/messenger/ui/SearchActivity.java b/src/main/java/eu/siacs/conversations/ui/SearchActivity.java similarity index 90% rename from src/main/java/de/pixart/messenger/ui/SearchActivity.java rename to src/main/java/eu/siacs/conversations/ui/SearchActivity.java index dce7b370c5..057b5327e9 100644 --- a/src/main/java/de/pixart/messenger/ui/SearchActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/SearchActivity.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.os.Bundle; import android.text.Editable; @@ -48,28 +48,28 @@ import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.ActivitySearchBinding; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.Conversational; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.services.MessageSearchTask; -import de.pixart.messenger.ui.adapter.MessageAdapter; -import de.pixart.messenger.ui.interfaces.OnSearchResultsAvailable; -import de.pixart.messenger.ui.util.ChangeWatcher; -import de.pixart.messenger.ui.util.DateSeparator; -import de.pixart.messenger.ui.util.ListViewUtils; -import de.pixart.messenger.ui.util.PendingItem; -import de.pixart.messenger.ui.util.ShareUtil; -import de.pixart.messenger.ui.util.StyledAttributes; -import de.pixart.messenger.utils.FtsUtils; -import de.pixart.messenger.utils.MessageUtils; -import de.pixart.messenger.utils.UIHelper; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.ActivitySearchBinding; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Conversational; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.services.MessageSearchTask; +import eu.siacs.conversations.ui.adapter.MessageAdapter; +import eu.siacs.conversations.ui.interfaces.OnSearchResultsAvailable; +import eu.siacs.conversations.ui.util.ChangeWatcher; +import eu.siacs.conversations.ui.util.DateSeparator; +import eu.siacs.conversations.ui.util.ListViewUtils; +import eu.siacs.conversations.ui.util.PendingItem; +import eu.siacs.conversations.ui.util.ShareUtil; +import eu.siacs.conversations.ui.util.StyledAttributes; +import eu.siacs.conversations.utils.FtsUtils; +import eu.siacs.conversations.utils.MessageUtils; +import eu.siacs.conversations.utils.UIHelper; -import static de.pixart.messenger.ui.util.SoftKeyboardUtils.hideSoftKeyboard; -import static de.pixart.messenger.ui.util.SoftKeyboardUtils.showKeyboard; +import static eu.siacs.conversations.ui.util.SoftKeyboardUtils.hideSoftKeyboard; +import static eu.siacs.conversations.ui.util.SoftKeyboardUtils.showKeyboard; public class SearchActivity extends XmppActivity implements TextWatcher, OnSearchResultsAvailable, MessageAdapter.OnContactPictureClicked { diff --git a/src/main/java/de/pixart/messenger/ui/SetSettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SetSettingsActivity.java similarity index 88% rename from src/main/java/de/pixart/messenger/ui/SetSettingsActivity.java rename to src/main/java/eu/siacs/conversations/ui/SetSettingsActivity.java index 27119f5fda..4afc9e3da5 100644 --- a/src/main/java/de/pixart/messenger/ui/SetSettingsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/SetSettingsActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.Intent; import android.content.SharedPreferences; @@ -11,21 +11,21 @@ import androidx.appcompat.app.AlertDialog; import androidx.appcompat.widget.Toolbar; import androidx.databinding.DataBindingUtil; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.ActivitySetSettingsBinding; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.utils.AccountUtils; -import de.pixart.messenger.utils.FirstStartManager; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.ActivitySetSettingsBinding; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.utils.AccountUtils; +import eu.siacs.conversations.utils.FirstStartManager; -import static de.pixart.messenger.ui.SettingsActivity.BROADCAST_LAST_ACTIVITY; -import static de.pixart.messenger.ui.SettingsActivity.CHAT_STATES; -import static de.pixart.messenger.ui.SettingsActivity.CONFIRM_MESSAGES; -import static de.pixart.messenger.ui.SettingsActivity.FORBID_SCREENSHOTS; -import static de.pixart.messenger.ui.SettingsActivity.SHOW_LINKS_INSIDE; -import static de.pixart.messenger.ui.SettingsActivity.SHOW_MAPS_INSIDE; -import static de.pixart.messenger.ui.SettingsActivity.USE_INVIDIOUS; +import static eu.siacs.conversations.ui.SettingsActivity.BROADCAST_LAST_ACTIVITY; +import static eu.siacs.conversations.ui.SettingsActivity.CHAT_STATES; +import static eu.siacs.conversations.ui.SettingsActivity.CONFIRM_MESSAGES; +import static eu.siacs.conversations.ui.SettingsActivity.FORBID_SCREENSHOTS; +import static eu.siacs.conversations.ui.SettingsActivity.SHOW_LINKS_INSIDE; +import static eu.siacs.conversations.ui.SettingsActivity.SHOW_MAPS_INSIDE; +import static eu.siacs.conversations.ui.SettingsActivity.USE_INVIDIOUS; public class SetSettingsActivity extends XmppActivity implements XmppConnectionService.OnAccountUpdate { ActivitySetSettingsBinding binding; diff --git a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java similarity index 98% rename from src/main/java/de/pixart/messenger/ui/SettingsActivity.java rename to src/main/java/eu/siacs/conversations/ui/SettingsActivity.java index b34161a0c5..9c3ce120a9 100644 --- a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.app.FragmentManager; import android.content.DialogInterface; @@ -30,15 +30,15 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.crypto.OmemoSetting; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.persistance.FileBackend; -import de.pixart.messenger.services.ExportBackupService; -import de.pixart.messenger.services.MemorizingTrustManager; -import de.pixart.messenger.ui.util.StyledAttributes; -import de.pixart.messenger.utils.TimeframeUtils; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.crypto.OmemoSetting; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.services.ExportBackupService; +import eu.siacs.conversations.services.MemorizingTrustManager; +import eu.siacs.conversations.ui.util.StyledAttributes; +import eu.siacs.conversations.utils.TimeframeUtils; import me.drakeet.support.toast.ToastCompat; import rocks.xmpp.addr.Jid; diff --git a/src/main/java/de/pixart/messenger/ui/SettingsFragment.java b/src/main/java/eu/siacs/conversations/ui/SettingsFragment.java similarity index 93% rename from src/main/java/de/pixart/messenger/ui/SettingsFragment.java rename to src/main/java/eu/siacs/conversations/ui/SettingsFragment.java index ec4898f891..d5f6a34623 100644 --- a/src/main/java/de/pixart/messenger/ui/SettingsFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/SettingsFragment.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.Intent; import android.os.Bundle; @@ -8,9 +8,9 @@ import android.preference.PreferenceFragment; import android.preference.PreferenceScreen; import android.text.TextUtils; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.utils.Compatibility; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.utils.Compatibility; public class SettingsFragment extends PreferenceFragment { diff --git a/src/main/java/de/pixart/messenger/ui/ShareLocationActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java similarity index 98% rename from src/main/java/de/pixart/messenger/ui/ShareLocationActivity.java rename to src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java index 1231ac86e7..ee1d525a15 100644 --- a/src/main/java/de/pixart/messenger/ui/ShareLocationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.annotation.TargetApi; import android.content.Context; @@ -26,9 +26,9 @@ import java.lang.ref.WeakReference; import java.util.List; import java.util.Locale; -import de.pixart.messenger.R; -import de.pixart.messenger.utils.LocationHelper; -import de.pixart.messenger.utils.ThemeHelper; +import eu.siacs.conversations.R; +import eu.siacs.conversations.utils.LocationHelper; +import eu.siacs.conversations.utils.ThemeHelper; public class ShareLocationActivity extends LocationActivity implements LocationListener { diff --git a/src/main/java/de/pixart/messenger/ui/ShareViaAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareViaAccountActivity.java similarity index 92% rename from src/main/java/de/pixart/messenger/ui/ShareViaAccountActivity.java rename to src/main/java/eu/siacs/conversations/ui/ShareViaAccountActivity.java index 4f0e81e0d8..35d9f2f33a 100644 --- a/src/main/java/de/pixart/messenger/ui/ShareViaAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ShareViaAccountActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.os.Bundle; import android.widget.ListView; @@ -6,10 +6,10 @@ import android.widget.ListView; import java.util.ArrayList; import java.util.List; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.ui.adapter.AccountAdapter; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.ui.adapter.AccountAdapter; import rocks.xmpp.addr.Jid; public class ShareViaAccountActivity extends XmppActivity { diff --git a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java similarity index 95% rename from src/main/java/de/pixart/messenger/ui/ShareWithActivity.java rename to src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java index 5d44a26872..b534ee2c24 100644 --- a/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.Intent; import android.content.pm.PackageManager; @@ -15,12 +15,12 @@ import androidx.recyclerview.widget.RecyclerView; import java.util.ArrayList; import java.util.List; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.ui.adapter.ConversationAdapter; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.ui.adapter.ConversationAdapter; import me.drakeet.support.toast.ToastCompat; import rocks.xmpp.addr.Jid; diff --git a/src/main/java/de/pixart/messenger/ui/ShortcutActivity.java b/src/main/java/eu/siacs/conversations/ui/ShortcutActivity.java similarity index 92% rename from src/main/java/de/pixart/messenger/ui/ShortcutActivity.java rename to src/main/java/eu/siacs/conversations/ui/ShortcutActivity.java index b19f916eaf..5cc8765ac2 100644 --- a/src/main/java/de/pixart/messenger/ui/ShortcutActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ShortcutActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.ComponentName; import android.content.Context; @@ -12,10 +12,10 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.ListItem; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.ListItem; public class ShortcutActivity extends AbstractSearchableListItemActivity { diff --git a/src/main/java/de/pixart/messenger/ui/ShowLocationActivity.java b/src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java similarity index 97% rename from src/main/java/de/pixart/messenger/ui/ShowLocationActivity.java rename to src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java index 2c878aeffa..ddfbf64d4d 100644 --- a/src/main/java/de/pixart/messenger/ui/ShowLocationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.ActivityNotFoundException; import android.content.Context; @@ -25,9 +25,9 @@ import java.lang.ref.WeakReference; import java.util.List; import java.util.Locale; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.utils.MenuDoubleTabUtil; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.utils.MenuDoubleTabUtil; import me.drakeet.support.toast.ToastCompat; public class ShowLocationActivity extends XmppActivity { diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java similarity index 97% rename from src/main/java/de/pixart/messenger/ui/StartConversationActivity.java rename to src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index b0e880cba0..170b7479a3 100644 --- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.Manifest; import android.annotation.SuppressLint; @@ -55,36 +55,36 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.ActivityStartConversationBinding; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Bookmark; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.ListItem; -import de.pixart.messenger.entities.MucOptions; -import de.pixart.messenger.entities.Presence; -import de.pixart.messenger.services.QuickConversationsService; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.services.XmppConnectionService.OnRosterUpdate; -import de.pixart.messenger.ui.adapter.ListItemAdapter; -import de.pixart.messenger.ui.interfaces.OnBackendConnected; -import de.pixart.messenger.ui.util.IntroHelper; -import de.pixart.messenger.ui.util.JidDialog; -import de.pixart.messenger.ui.util.PendingItem; -import de.pixart.messenger.ui.util.SoftKeyboardUtils; -import de.pixart.messenger.utils.AccountUtils; -import de.pixart.messenger.utils.MenuDoubleTabUtil; -import de.pixart.messenger.utils.XmppUri; -import de.pixart.messenger.xmpp.OnUpdateBlocklist; -import de.pixart.messenger.xmpp.XmppConnection; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.ActivityStartConversationBinding; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Bookmark; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.ListItem; +import eu.siacs.conversations.entities.MucOptions; +import eu.siacs.conversations.entities.Presence; +import eu.siacs.conversations.services.QuickConversationsService; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.services.XmppConnectionService.OnRosterUpdate; +import eu.siacs.conversations.ui.adapter.ListItemAdapter; +import eu.siacs.conversations.ui.interfaces.OnBackendConnected; +import eu.siacs.conversations.ui.util.IntroHelper; +import eu.siacs.conversations.ui.util.JidDialog; +import eu.siacs.conversations.ui.util.PendingItem; +import eu.siacs.conversations.ui.util.SoftKeyboardUtils; +import eu.siacs.conversations.utils.AccountUtils; +import eu.siacs.conversations.utils.MenuDoubleTabUtil; +import eu.siacs.conversations.utils.XmppUri; +import eu.siacs.conversations.xmpp.OnUpdateBlocklist; +import eu.siacs.conversations.xmpp.XmppConnection; import me.drakeet.support.toast.ToastCompat; import rocks.xmpp.addr.Jid; public class StartConversationActivity extends XmppActivity implements XmppConnectionService.OnConversationUpdate, OnRosterUpdate, OnUpdateBlocklist, CreatePrivateGroupChatDialog.CreateConferenceDialogListener, JoinConferenceDialog.JoinConferenceDialogListener, CreatePublicChannelDialog.CreatePublicChannelDialogListener { - public static final String EXTRA_INVITE_URI = "de.pixart.messenger.invite_uri"; + public static final String EXTRA_INVITE_URI = "eu.siacs.conversations.invite_uri"; private final int REQUEST_SYNC_CONTACTS = 0x28cf; private final int REQUEST_CREATE_CONFERENCE = 0x39da; diff --git a/src/main/java/de/pixart/messenger/ui/TimePreference.java b/src/main/java/eu/siacs/conversations/ui/TimePreference.java similarity index 98% rename from src/main/java/de/pixart/messenger/ui/TimePreference.java rename to src/main/java/eu/siacs/conversations/ui/TimePreference.java index 97750d6e3b..671b5ae876 100644 --- a/src/main/java/de/pixart/messenger/ui/TimePreference.java +++ b/src/main/java/eu/siacs/conversations/ui/TimePreference.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.Context; import android.content.res.TypedArray; diff --git a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java b/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java similarity index 96% rename from src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java rename to src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java index 699b50abc4..1925258f70 100644 --- a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import androidx.appcompat.app.AlertDialog; import android.content.Intent; @@ -24,21 +24,21 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.crypto.OmemoSetting; -import de.pixart.messenger.crypto.axolotl.AxolotlService; -import de.pixart.messenger.crypto.axolotl.FingerprintStatus; -import de.pixart.messenger.databinding.ActivityTrustKeysBinding; -import de.pixart.messenger.databinding.KeysCardBinding; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.utils.CryptoHelper; -import de.pixart.messenger.utils.IrregularUnicodeDetector; -import de.pixart.messenger.utils.XmppUri; -import de.pixart.messenger.xmpp.OnKeyStatusUpdated; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.crypto.OmemoSetting; +import eu.siacs.conversations.crypto.axolotl.AxolotlService; +import eu.siacs.conversations.crypto.axolotl.FingerprintStatus; +import eu.siacs.conversations.databinding.ActivityTrustKeysBinding; +import eu.siacs.conversations.databinding.KeysCardBinding; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.utils.IrregularUnicodeDetector; +import eu.siacs.conversations.utils.XmppUri; +import eu.siacs.conversations.xmpp.OnKeyStatusUpdated; import me.drakeet.support.toast.ToastCompat; import rocks.xmpp.addr.Jid; diff --git a/src/main/java/de/pixart/messenger/ui/UiCallback.java b/src/main/java/eu/siacs/conversations/ui/UiCallback.java similarity index 84% rename from src/main/java/de/pixart/messenger/ui/UiCallback.java rename to src/main/java/eu/siacs/conversations/ui/UiCallback.java index 59b12c7e64..7a8f55113f 100644 --- a/src/main/java/de/pixart/messenger/ui/UiCallback.java +++ b/src/main/java/eu/siacs/conversations/ui/UiCallback.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.app.PendingIntent; diff --git a/src/main/java/de/pixart/messenger/ui/UiInformableCallback.java b/src/main/java/eu/siacs/conversations/ui/UiInformableCallback.java similarity index 72% rename from src/main/java/de/pixart/messenger/ui/UiInformableCallback.java rename to src/main/java/eu/siacs/conversations/ui/UiInformableCallback.java index 53ed044ccb..cef22ebe66 100644 --- a/src/main/java/de/pixart/messenger/ui/UiInformableCallback.java +++ b/src/main/java/eu/siacs/conversations/ui/UiInformableCallback.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; public interface UiInformableCallback extends UiCallback { void inform(String text); diff --git a/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java b/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java similarity index 97% rename from src/main/java/de/pixart/messenger/ui/UpdaterActivity.java rename to src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java index f3b233f208..af2f0ae7f9 100644 --- a/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.Manifest; import android.app.ProgressDialog; @@ -34,17 +34,17 @@ import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocketFactory; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.http.NoSSLv3SocketFactory; -import de.pixart.messenger.persistance.FileBackend; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.utils.WakeLockHelper; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.http.NoSSLv3SocketFactory; +import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.utils.WakeLockHelper; import me.drakeet.support.toast.ToastCompat; -import static de.pixart.messenger.http.HttpConnectionManager.getProxy; -import static de.pixart.messenger.services.XmppConnectionService.FDroid; -import static de.pixart.messenger.services.XmppConnectionService.PlayStore; +import static eu.siacs.conversations.http.HttpConnectionManager.getProxy; +import static eu.siacs.conversations.services.XmppConnectionService.FDroid; +import static eu.siacs.conversations.services.XmppConnectionService.PlayStore; public class UpdaterActivity extends XmppActivity { static final private String FileName = "update.apk"; diff --git a/src/main/java/de/pixart/messenger/ui/UriHandlerActivity.java b/src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java similarity index 96% rename from src/main/java/de/pixart/messenger/ui/UriHandlerActivity.java rename to src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java index f0331b882d..b665082277 100644 --- a/src/main/java/de/pixart/messenger/ui/UriHandlerActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/UriHandlerActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.Manifest; import android.app.Activity; @@ -16,10 +16,10 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import de.pixart.messenger.R; -import de.pixart.messenger.persistance.DatabaseBackend; -import de.pixart.messenger.utils.SignupUtils; -import de.pixart.messenger.utils.XmppUri; +import eu.siacs.conversations.R; +import eu.siacs.conversations.persistance.DatabaseBackend; +import eu.siacs.conversations.utils.SignupUtils; +import eu.siacs.conversations.utils.XmppUri; import me.drakeet.support.toast.ToastCompat; import rocks.xmpp.addr.Jid; @@ -123,7 +123,7 @@ public class UriHandlerActivity extends AppCompatActivity { if (jid != null) { Class clazz; try { - clazz = Class.forName("de.pixart.messenger.ui.ShareViaAccountActivity"); + clazz = Class.forName("eu.siacs.conversations.ui.ShareViaAccountActivity"); } catch (ClassNotFoundException e) { clazz = null; } diff --git a/src/main/java/de/pixart/messenger/ui/VerifyOTRActivity.java b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java similarity index 97% rename from src/main/java/de/pixart/messenger/ui/VerifyOTRActivity.java rename to src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java index c7b7f4cad5..e551bebef8 100644 --- a/src/main/java/de/pixart/messenger/ui/VerifyOTRActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.content.DialogInterface; import android.content.Intent; @@ -18,14 +18,14 @@ import androidx.appcompat.app.AlertDialog; import net.java.otr4j.OtrException; import net.java.otr4j.session.Session; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.utils.CryptoHelper; -import de.pixart.messenger.utils.XmppUri; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.utils.XmppUri; import me.drakeet.support.toast.ToastCompat; import rocks.xmpp.addr.Jid; diff --git a/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java b/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java similarity index 92% rename from src/main/java/de/pixart/messenger/ui/WelcomeActivity.java rename to src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java index 92321c32ab..b4b1ad9e5c 100644 --- a/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.Manifest; import android.content.Intent; @@ -19,20 +19,20 @@ import androidx.databinding.DataBindingUtil; import java.util.Arrays; import java.util.List; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.WelcomeBinding; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.ui.util.IntroHelper; -import de.pixart.messenger.utils.InstallReferrerUtils; -import de.pixart.messenger.utils.SignupUtils; -import de.pixart.messenger.utils.XmppUri; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.WelcomeBinding; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.ui.util.IntroHelper; +import eu.siacs.conversations.utils.InstallReferrerUtils; +import eu.siacs.conversations.utils.SignupUtils; +import eu.siacs.conversations.utils.XmppUri; import me.drakeet.support.toast.ToastCompat; import rocks.xmpp.addr.Jid; -import static de.pixart.messenger.Config.DISALLOW_REGISTRATION_IN_UI; -import static de.pixart.messenger.utils.PermissionUtils.allGranted; -import static de.pixart.messenger.utils.PermissionUtils.readGranted; +import static eu.siacs.conversations.Config.DISALLOW_REGISTRATION_IN_UI; +import static eu.siacs.conversations.utils.PermissionUtils.allGranted; +import static eu.siacs.conversations.utils.PermissionUtils.readGranted; public class WelcomeActivity extends XmppActivity { diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java similarity index 97% rename from src/main/java/de/pixart/messenger/ui/XmppActivity.java rename to src/main/java/eu/siacs/conversations/ui/XmppActivity.java index 624119bb85..d28cbaace1 100644 --- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.Manifest; import android.annotation.SuppressLint; @@ -68,38 +68,38 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.atomic.AtomicInteger; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.crypto.PgpEngine; -import de.pixart.messenger.databinding.DialogQuickeditBinding; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.entities.Presences; -import de.pixart.messenger.services.AvatarService; -import de.pixart.messenger.services.BarcodeProvider; -import de.pixart.messenger.services.EmojiService; -import de.pixart.messenger.services.UpdateService; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.services.XmppConnectionService.XmppConnectionBinder; -import de.pixart.messenger.ui.util.PresenceSelector; -import de.pixart.messenger.ui.util.SoftKeyboardUtils; -import de.pixart.messenger.utils.AccountUtils; -import de.pixart.messenger.utils.CryptoHelper; -import de.pixart.messenger.utils.ExceptionHelper; -import de.pixart.messenger.utils.MenuDoubleTabUtil; -import de.pixart.messenger.utils.ThemeHelper; -import de.pixart.messenger.xmpp.OnKeyStatusUpdated; -import de.pixart.messenger.xmpp.OnUpdateBlocklist; -import de.pixart.messenger.xmpp.XmppConnection; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.crypto.PgpEngine; +import eu.siacs.conversations.databinding.DialogQuickeditBinding; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.entities.Presences; +import eu.siacs.conversations.services.AvatarService; +import eu.siacs.conversations.services.BarcodeProvider; +import eu.siacs.conversations.services.EmojiService; +import eu.siacs.conversations.services.UpdateService; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.services.XmppConnectionService.XmppConnectionBinder; +import eu.siacs.conversations.ui.util.PresenceSelector; +import eu.siacs.conversations.ui.util.SoftKeyboardUtils; +import eu.siacs.conversations.utils.AccountUtils; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.utils.ExceptionHelper; +import eu.siacs.conversations.utils.MenuDoubleTabUtil; +import eu.siacs.conversations.utils.ThemeHelper; +import eu.siacs.conversations.xmpp.OnKeyStatusUpdated; +import eu.siacs.conversations.xmpp.OnUpdateBlocklist; +import eu.siacs.conversations.xmpp.XmppConnection; import me.drakeet.support.toast.ToastCompat; import pl.droidsonroids.gif.GifDrawable; import rocks.xmpp.addr.Jid; -import static de.pixart.messenger.ui.SettingsActivity.ENABLE_OTR_ENCRYPTION; -import static de.pixart.messenger.ui.SettingsActivity.USE_BUNDLED_EMOJIS; -import static de.pixart.messenger.ui.SettingsActivity.USE_INTERNAL_UPDATER; +import static eu.siacs.conversations.ui.SettingsActivity.USE_BUNDLED_EMOJIS; +import static eu.siacs.conversations.ui.SettingsActivity.ENABLE_OTR_ENCRYPTION; +import static eu.siacs.conversations.ui.SettingsActivity.USE_INTERNAL_UPDATER; public abstract class XmppActivity extends ActionBarActivity { diff --git a/src/main/java/de/pixart/messenger/ui/XmppFragment.java b/src/main/java/eu/siacs/conversations/ui/XmppFragment.java similarity index 95% rename from src/main/java/de/pixart/messenger/ui/XmppFragment.java rename to src/main/java/eu/siacs/conversations/ui/XmppFragment.java index 36cc51bb0e..403b7310ec 100644 --- a/src/main/java/de/pixart/messenger/ui/XmppFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/XmppFragment.java @@ -27,12 +27,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui; +package eu.siacs.conversations.ui; import android.app.Activity; import android.app.Fragment; -import de.pixart.messenger.ui.interfaces.OnBackendConnected; +import eu.siacs.conversations.ui.interfaces.OnBackendConnected; public abstract class XmppFragment extends Fragment implements OnBackendConnected { diff --git a/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java similarity index 90% rename from src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java rename to src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java index 6271a0c66f..9484f315eb 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.adapter; +package eu.siacs.conversations.ui.adapter; import android.view.LayoutInflater; import android.view.View; @@ -10,13 +10,13 @@ import androidx.databinding.DataBindingUtil; import java.util.List; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.AccountRowBinding; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.ui.XmppActivity; -import de.pixart.messenger.ui.util.AvatarWorkerTask; -import de.pixart.messenger.ui.util.StyledAttributes; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.AccountRowBinding; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.ui.XmppActivity; +import eu.siacs.conversations.ui.util.AvatarWorkerTask; +import eu.siacs.conversations.ui.util.StyledAttributes; public class AccountAdapter extends ArrayAdapter { diff --git a/src/main/java/de/pixart/messenger/ui/adapter/BackupFileAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/BackupFileAdapter.java similarity index 94% rename from src/main/java/de/pixart/messenger/ui/adapter/BackupFileAdapter.java rename to src/main/java/eu/siacs/conversations/ui/adapter/BackupFileAdapter.java index 4cacec20dd..0b6a7abcab 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/BackupFileAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/BackupFileAdapter.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.adapter; +package eu.siacs.conversations.ui.adapter; import android.content.res.Resources; import android.graphics.Bitmap; @@ -21,12 +21,12 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.RejectedExecutionException; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.AccountRowBinding; -import de.pixart.messenger.services.AvatarService; -import de.pixart.messenger.services.ImportBackupService; -import de.pixart.messenger.utils.BackupFileHeader; -import de.pixart.messenger.utils.UIHelper; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.AccountRowBinding; +import eu.siacs.conversations.services.AvatarService; +import eu.siacs.conversations.services.ImportBackupService; +import eu.siacs.conversations.utils.BackupFileHeader; +import eu.siacs.conversations.utils.UIHelper; import rocks.xmpp.addr.Jid; public class BackupFileAdapter extends RecyclerView.Adapter { diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ChannelSearchResultAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ChannelSearchResultAdapter.java similarity index 92% rename from src/main/java/de/pixart/messenger/ui/adapter/ChannelSearchResultAdapter.java rename to src/main/java/eu/siacs/conversations/ui/adapter/ChannelSearchResultAdapter.java index 4094a01683..4854aa365c 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/ChannelSearchResultAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/ChannelSearchResultAdapter.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.adapter; +package eu.siacs.conversations.ui.adapter; import android.app.Activity; import android.text.TextUtils; @@ -15,11 +15,11 @@ import androidx.recyclerview.widget.RecyclerView; import java.util.Locale; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.SearchResultItemBinding; -import de.pixart.messenger.entities.Room; -import de.pixart.messenger.ui.XmppActivity; -import de.pixart.messenger.ui.util.AvatarWorkerTask; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.SearchResultItemBinding; +import eu.siacs.conversations.entities.Room; +import eu.siacs.conversations.ui.XmppActivity; +import eu.siacs.conversations.ui.util.AvatarWorkerTask; import rocks.xmpp.addr.Jid; diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java similarity index 95% rename from src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java rename to src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java index 7ce7573a36..e5eca6d006 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.adapter; +package eu.siacs.conversations.ui.adapter; import android.content.SharedPreferences; import android.graphics.Typeface; @@ -19,23 +19,23 @@ import androidx.recyclerview.widget.RecyclerView; import java.util.List; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.ConversationListRowBinding; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.entities.MucOptions; -import de.pixart.messenger.ui.ConversationFragment; -import de.pixart.messenger.ui.XmppActivity; -import de.pixart.messenger.ui.util.AvatarWorkerTask; -import de.pixart.messenger.ui.util.StyledAttributes; -import de.pixart.messenger.utils.EmojiWrapper; -import de.pixart.messenger.utils.IrregularUnicodeDetector; -import de.pixart.messenger.utils.UIHelper; -import de.pixart.messenger.xmpp.chatstate.ChatState; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.ConversationListRowBinding; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.entities.MucOptions; +import eu.siacs.conversations.ui.ConversationFragment; +import eu.siacs.conversations.ui.XmppActivity; +import eu.siacs.conversations.ui.util.AvatarWorkerTask; +import eu.siacs.conversations.ui.util.StyledAttributes; +import eu.siacs.conversations.utils.EmojiWrapper; +import eu.siacs.conversations.utils.IrregularUnicodeDetector; +import eu.siacs.conversations.utils.UIHelper; +import eu.siacs.conversations.xmpp.chatstate.ChatState; import rocks.xmpp.addr.Jid; -import static de.pixart.messenger.entities.Message.DELETED_MESSAGE_BODY; -import static de.pixart.messenger.ui.util.MyLinkify.replaceYoutube; +import static eu.siacs.conversations.entities.Message.DELETED_MESSAGE_BODY; +import static eu.siacs.conversations.ui.util.MyLinkify.replaceYoutube; public class ConversationAdapter extends RecyclerView.Adapter { diff --git a/src/main/java/de/pixart/messenger/ui/adapter/KnownHostsAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java similarity index 98% rename from src/main/java/de/pixart/messenger/ui/adapter/KnownHostsAdapter.java rename to src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java index a442d32aa0..f48d9a1aa1 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/KnownHostsAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.adapter; +package eu.siacs.conversations.ui.adapter; import android.content.Context; import android.widget.ArrayAdapter; diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java similarity index 92% rename from src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java rename to src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java index 9f1824a865..d87d098410 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.adapter; +package eu.siacs.conversations.ui.adapter; import android.content.SharedPreferences; import android.preference.PreferenceManager; @@ -15,15 +15,15 @@ import com.wefika.flowlayout.FlowLayout; import java.util.List; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.ContactBinding; -import de.pixart.messenger.entities.ListItem; -import de.pixart.messenger.ui.SettingsActivity; -import de.pixart.messenger.ui.XmppActivity; -import de.pixart.messenger.ui.util.AvatarWorkerTask; -import de.pixart.messenger.ui.util.StyledAttributes; -import de.pixart.messenger.utils.EmojiWrapper; -import de.pixart.messenger.utils.IrregularUnicodeDetector; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.ContactBinding; +import eu.siacs.conversations.entities.ListItem; +import eu.siacs.conversations.ui.SettingsActivity; +import eu.siacs.conversations.ui.XmppActivity; +import eu.siacs.conversations.ui.util.AvatarWorkerTask; +import eu.siacs.conversations.ui.util.StyledAttributes; +import eu.siacs.conversations.utils.EmojiWrapper; +import eu.siacs.conversations.utils.IrregularUnicodeDetector; import rocks.xmpp.addr.Jid; public class ListItemAdapter extends ArrayAdapter { diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MediaAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java similarity index 96% rename from src/main/java/de/pixart/messenger/ui/adapter/MediaAdapter.java rename to src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java index 3dfa9b5604..9ac6b83142 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/MediaAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MediaAdapter.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.adapter; +package eu.siacs.conversations.ui.adapter; import android.content.ActivityNotFoundException; import android.content.Context; @@ -33,16 +33,16 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.RejectedExecutionException; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.MediaBinding; -import de.pixart.messenger.persistance.FileBackend; -import de.pixart.messenger.services.ExportBackupService; -import de.pixart.messenger.ui.XmppActivity; -import de.pixart.messenger.ui.util.Attachment; -import de.pixart.messenger.ui.util.StyledAttributes; -import de.pixart.messenger.ui.util.ViewUtil; -import de.pixart.messenger.utils.MimeUtils; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.MediaBinding; +import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.services.ExportBackupService; +import eu.siacs.conversations.ui.XmppActivity; +import eu.siacs.conversations.ui.util.Attachment; +import eu.siacs.conversations.ui.util.StyledAttributes; +import eu.siacs.conversations.ui.util.ViewUtil; +import eu.siacs.conversations.utils.MimeUtils; import me.drakeet.support.toast.ToastCompat; public class MediaAdapter extends RecyclerView.Adapter { diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MediaPreviewAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MediaPreviewAdapter.java similarity index 95% rename from src/main/java/de/pixart/messenger/ui/adapter/MediaPreviewAdapter.java rename to src/main/java/eu/siacs/conversations/ui/adapter/MediaPreviewAdapter.java index 07d07cb5d7..996db649d4 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/MediaPreviewAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MediaPreviewAdapter.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.adapter; +package eu.siacs.conversations.ui.adapter; import android.content.Context; import android.content.res.Resources; @@ -19,11 +19,11 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.RejectedExecutionException; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.MediaPreviewBinding; -import de.pixart.messenger.ui.ConversationFragment; -import de.pixart.messenger.ui.XmppActivity; -import de.pixart.messenger.ui.util.Attachment; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.MediaPreviewBinding; +import eu.siacs.conversations.ui.ConversationFragment; +import eu.siacs.conversations.ui.XmppActivity; +import eu.siacs.conversations.ui.util.Attachment; public class MediaPreviewAdapter extends RecyclerView.Adapter { diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java similarity index 96% rename from src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java rename to src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index f85670ec0e..3e346b6671 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.adapter; +package eu.siacs.conversations.ui.adapter; import android.Manifest; import android.app.Activity; @@ -52,55 +52,55 @@ import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.crypto.axolotl.FingerprintStatus; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.Conversational; -import de.pixart.messenger.entities.DownloadableFile; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.entities.Message.FileParams; -import de.pixart.messenger.entities.Transferable; -import de.pixart.messenger.http.P1S3UrlStreamHandler; -import de.pixart.messenger.persistance.FileBackend; -import de.pixart.messenger.services.AudioPlayer; -import de.pixart.messenger.services.MessageArchiveService; -import de.pixart.messenger.services.NotificationService; -import de.pixart.messenger.ui.ConversationFragment; -import de.pixart.messenger.ui.ConversationsActivity; -import de.pixart.messenger.ui.XmppActivity; -import de.pixart.messenger.ui.text.DividerSpan; -import de.pixart.messenger.ui.text.QuoteSpan; -import de.pixart.messenger.ui.util.AvatarWorkerTask; -import de.pixart.messenger.ui.util.MyLinkify; -import de.pixart.messenger.ui.util.StyledAttributes; -import de.pixart.messenger.ui.util.ViewUtil; -import de.pixart.messenger.ui.widget.ClickableMovementMethod; -import de.pixart.messenger.ui.widget.CopyTextView; -import de.pixart.messenger.ui.widget.ListSelectionManager; -import de.pixart.messenger.ui.widget.RichLinkView; -import de.pixart.messenger.utils.CryptoHelper; -import de.pixart.messenger.utils.EmojiWrapper; -import de.pixart.messenger.utils.Emoticons; -import de.pixart.messenger.utils.GeoHelper; -import de.pixart.messenger.utils.MessageUtils; -import de.pixart.messenger.utils.RichPreview; -import de.pixart.messenger.utils.StylingHelper; -import de.pixart.messenger.utils.UIHelper; -import de.pixart.messenger.xmpp.mam.MamReference; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.crypto.axolotl.FingerprintStatus; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Conversational; +import eu.siacs.conversations.entities.DownloadableFile; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.entities.Message.FileParams; +import eu.siacs.conversations.entities.Transferable; +import eu.siacs.conversations.http.P1S3UrlStreamHandler; +import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.services.AudioPlayer; +import eu.siacs.conversations.services.MessageArchiveService; +import eu.siacs.conversations.services.NotificationService; +import eu.siacs.conversations.ui.ConversationFragment; +import eu.siacs.conversations.ui.ConversationsActivity; +import eu.siacs.conversations.ui.XmppActivity; +import eu.siacs.conversations.ui.text.DividerSpan; +import eu.siacs.conversations.ui.text.QuoteSpan; +import eu.siacs.conversations.ui.util.AvatarWorkerTask; +import eu.siacs.conversations.ui.util.MyLinkify; +import eu.siacs.conversations.ui.util.StyledAttributes; +import eu.siacs.conversations.ui.util.ViewUtil; +import eu.siacs.conversations.ui.widget.ClickableMovementMethod; +import eu.siacs.conversations.ui.widget.CopyTextView; +import eu.siacs.conversations.ui.widget.ListSelectionManager; +import eu.siacs.conversations.ui.widget.RichLinkView; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.utils.EmojiWrapper; +import eu.siacs.conversations.utils.Emoticons; +import eu.siacs.conversations.utils.GeoHelper; +import eu.siacs.conversations.utils.MessageUtils; +import eu.siacs.conversations.utils.RichPreview; +import eu.siacs.conversations.utils.StylingHelper; +import eu.siacs.conversations.utils.UIHelper; +import eu.siacs.conversations.xmpp.mam.MamReference; import me.drakeet.support.toast.ToastCompat; import pl.droidsonroids.gif.GifImageView; import rocks.xmpp.addr.Jid; import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT; -import static de.pixart.messenger.entities.Message.DELETED_MESSAGE_BODY; -import static de.pixart.messenger.ui.SettingsActivity.PLAY_GIF_INSIDE; -import static de.pixart.messenger.ui.SettingsActivity.SHOW_LINKS_INSIDE; -import static de.pixart.messenger.ui.SettingsActivity.SHOW_MAPS_INSIDE; -import static de.pixart.messenger.ui.util.MyLinkify.removeTrailingBracket; -import static de.pixart.messenger.ui.util.MyLinkify.replaceYoutube; -import static de.pixart.messenger.utils.Compatibility.runsTwentyOne; +import static eu.siacs.conversations.entities.Message.DELETED_MESSAGE_BODY; +import static eu.siacs.conversations.ui.SettingsActivity.PLAY_GIF_INSIDE; +import static eu.siacs.conversations.ui.SettingsActivity.SHOW_LINKS_INSIDE; +import static eu.siacs.conversations.ui.SettingsActivity.SHOW_MAPS_INSIDE; +import static eu.siacs.conversations.ui.util.MyLinkify.removeTrailingBracket; +import static eu.siacs.conversations.ui.util.MyLinkify.replaceYoutube; +import static eu.siacs.conversations.utils.Compatibility.runsTwentyOne; public class MessageAdapter extends ArrayAdapter implements CopyTextView.CopyHandler { diff --git a/src/main/java/de/pixart/messenger/ui/adapter/PresenceTemplateAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/PresenceTemplateAdapter.java similarity index 97% rename from src/main/java/de/pixart/messenger/ui/adapter/PresenceTemplateAdapter.java rename to src/main/java/eu/siacs/conversations/ui/adapter/PresenceTemplateAdapter.java index b1307d908c..7f533fd26c 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/PresenceTemplateAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/PresenceTemplateAdapter.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.adapter; +package eu.siacs.conversations.ui.adapter; import android.content.Context; import android.widget.ArrayAdapter; @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import de.pixart.messenger.entities.PresenceTemplate; +import eu.siacs.conversations.entities.PresenceTemplate; public class PresenceTemplateAdapter extends ArrayAdapter { diff --git a/src/main/java/de/pixart/messenger/ui/adapter/UserAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/UserAdapter.java similarity index 90% rename from src/main/java/de/pixart/messenger/ui/adapter/UserAdapter.java rename to src/main/java/eu/siacs/conversations/ui/adapter/UserAdapter.java index 1bea93ffac..7f6bba2148 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/UserAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/UserAdapter.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.adapter; +package eu.siacs.conversations.ui.adapter; import android.app.PendingIntent; import android.content.IntentSender; @@ -15,16 +15,16 @@ import androidx.recyclerview.widget.RecyclerView; import org.openintents.openpgp.util.OpenPgpUtils; -import de.pixart.messenger.R; -import de.pixart.messenger.crypto.PgpEngine; -import de.pixart.messenger.databinding.ContactBinding; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.MucOptions; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.ui.ConferenceDetailsActivity; -import de.pixart.messenger.ui.XmppActivity; -import de.pixart.messenger.ui.util.AvatarWorkerTask; -import de.pixart.messenger.ui.util.MucDetailsContextMenuHelper; +import eu.siacs.conversations.R; +import eu.siacs.conversations.crypto.PgpEngine; +import eu.siacs.conversations.databinding.ContactBinding; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.MucOptions; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.ui.ConferenceDetailsActivity; +import eu.siacs.conversations.ui.XmppActivity; +import eu.siacs.conversations.ui.util.AvatarWorkerTask; +import eu.siacs.conversations.ui.util.MucDetailsContextMenuHelper; import rocks.xmpp.addr.Jid; public class UserAdapter extends ListAdapter implements View.OnCreateContextMenuListener { diff --git a/src/main/java/de/pixart/messenger/ui/adapter/UserPreviewAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/UserPreviewAdapter.java similarity index 85% rename from src/main/java/de/pixart/messenger/ui/adapter/UserPreviewAdapter.java rename to src/main/java/eu/siacs/conversations/ui/adapter/UserPreviewAdapter.java index 5ab90b53ef..1bc645eca8 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/UserPreviewAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/UserPreviewAdapter.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.adapter; +package eu.siacs.conversations.ui.adapter; import android.view.ContextMenu; import android.view.LayoutInflater; @@ -10,12 +10,12 @@ import androidx.databinding.DataBindingUtil; import androidx.recyclerview.widget.ListAdapter; import androidx.recyclerview.widget.RecyclerView; -import de.pixart.messenger.R; -import de.pixart.messenger.databinding.UserPreviewBinding; -import de.pixart.messenger.entities.MucOptions; -import de.pixart.messenger.ui.XmppActivity; -import de.pixart.messenger.ui.util.AvatarWorkerTask; -import de.pixart.messenger.ui.util.MucDetailsContextMenuHelper; +import eu.siacs.conversations.R; +import eu.siacs.conversations.databinding.UserPreviewBinding; +import eu.siacs.conversations.entities.MucOptions; +import eu.siacs.conversations.ui.XmppActivity; +import eu.siacs.conversations.ui.util.AvatarWorkerTask; +import eu.siacs.conversations.ui.util.MucDetailsContextMenuHelper; public class UserPreviewAdapter extends ListAdapter implements View.OnCreateContextMenuListener { diff --git a/src/main/java/de/pixart/messenger/ui/forms/FormBooleanFieldWrapper.java b/src/main/java/eu/siacs/conversations/ui/forms/FormBooleanFieldWrapper.java similarity index 94% rename from src/main/java/de/pixart/messenger/ui/forms/FormBooleanFieldWrapper.java rename to src/main/java/eu/siacs/conversations/ui/forms/FormBooleanFieldWrapper.java index b403f619c8..f701058ee7 100644 --- a/src/main/java/de/pixart/messenger/ui/forms/FormBooleanFieldWrapper.java +++ b/src/main/java/eu/siacs/conversations/ui/forms/FormBooleanFieldWrapper.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.forms; +package eu.siacs.conversations.ui.forms; import android.content.Context; import android.widget.CheckBox; @@ -7,8 +7,8 @@ import android.widget.CompoundButton; import java.util.ArrayList; import java.util.List; -import de.pixart.messenger.R; -import de.pixart.messenger.xmpp.forms.Field; +import eu.siacs.conversations.R; +import eu.siacs.conversations.xmpp.forms.Field; public class FormBooleanFieldWrapper extends FormFieldWrapper { diff --git a/src/main/java/de/pixart/messenger/ui/forms/FormFieldFactory.java b/src/main/java/eu/siacs/conversations/ui/forms/FormFieldFactory.java similarity index 90% rename from src/main/java/de/pixart/messenger/ui/forms/FormFieldFactory.java rename to src/main/java/eu/siacs/conversations/ui/forms/FormFieldFactory.java index 5a30e35a50..229080a92c 100644 --- a/src/main/java/de/pixart/messenger/ui/forms/FormFieldFactory.java +++ b/src/main/java/eu/siacs/conversations/ui/forms/FormFieldFactory.java @@ -1,10 +1,10 @@ -package de.pixart.messenger.ui.forms; +package eu.siacs.conversations.ui.forms; import android.content.Context; import java.util.Hashtable; -import de.pixart.messenger.xmpp.forms.Field; +import eu.siacs.conversations.xmpp.forms.Field; public class FormFieldFactory { diff --git a/src/main/java/de/pixart/messenger/ui/forms/FormFieldWrapper.java b/src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java similarity index 94% rename from src/main/java/de/pixart/messenger/ui/forms/FormFieldWrapper.java rename to src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java index df41d58849..18cec27700 100644 --- a/src/main/java/de/pixart/messenger/ui/forms/FormFieldWrapper.java +++ b/src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.forms; +package eu.siacs.conversations.ui.forms; import android.content.Context; import android.text.SpannableString; @@ -9,9 +9,9 @@ import android.view.View; import java.util.List; -import de.pixart.messenger.R; -import de.pixart.messenger.ui.util.StyledAttributes; -import de.pixart.messenger.xmpp.forms.Field; +import eu.siacs.conversations.R; +import eu.siacs.conversations.ui.util.StyledAttributes; +import eu.siacs.conversations.xmpp.forms.Field; public abstract class FormFieldWrapper { diff --git a/src/main/java/de/pixart/messenger/ui/forms/FormJidSingleFieldWrapper.java b/src/main/java/eu/siacs/conversations/ui/forms/FormJidSingleFieldWrapper.java similarity index 90% rename from src/main/java/de/pixart/messenger/ui/forms/FormJidSingleFieldWrapper.java rename to src/main/java/eu/siacs/conversations/ui/forms/FormJidSingleFieldWrapper.java index b011cc77b1..33ec7a61e4 100644 --- a/src/main/java/de/pixart/messenger/ui/forms/FormJidSingleFieldWrapper.java +++ b/src/main/java/eu/siacs/conversations/ui/forms/FormJidSingleFieldWrapper.java @@ -1,12 +1,12 @@ -package de.pixart.messenger.ui.forms; +package eu.siacs.conversations.ui.forms; import android.content.Context; import android.text.InputType; import java.util.List; -import de.pixart.messenger.R; -import de.pixart.messenger.xmpp.forms.Field; +import eu.siacs.conversations.R; +import eu.siacs.conversations.xmpp.forms.Field; import rocks.xmpp.addr.Jid; public class FormJidSingleFieldWrapper extends FormTextFieldWrapper { diff --git a/src/main/java/de/pixart/messenger/ui/forms/FormTextFieldWrapper.java b/src/main/java/eu/siacs/conversations/ui/forms/FormTextFieldWrapper.java similarity index 95% rename from src/main/java/de/pixart/messenger/ui/forms/FormTextFieldWrapper.java rename to src/main/java/eu/siacs/conversations/ui/forms/FormTextFieldWrapper.java index 54f3439cc2..a197a0ebe4 100644 --- a/src/main/java/de/pixart/messenger/ui/forms/FormTextFieldWrapper.java +++ b/src/main/java/eu/siacs/conversations/ui/forms/FormTextFieldWrapper.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.forms; +package eu.siacs.conversations.ui.forms; import android.content.Context; import android.text.Editable; @@ -10,8 +10,8 @@ import android.widget.TextView; import java.util.ArrayList; import java.util.List; -import de.pixart.messenger.R; -import de.pixart.messenger.xmpp.forms.Field; +import eu.siacs.conversations.R; +import eu.siacs.conversations.xmpp.forms.Field; public class FormTextFieldWrapper extends FormFieldWrapper { diff --git a/src/main/java/de/pixart/messenger/ui/forms/FormWrapper.java b/src/main/java/eu/siacs/conversations/ui/forms/FormWrapper.java similarity index 93% rename from src/main/java/de/pixart/messenger/ui/forms/FormWrapper.java rename to src/main/java/eu/siacs/conversations/ui/forms/FormWrapper.java index f22bef7211..2a27f3c791 100644 --- a/src/main/java/de/pixart/messenger/ui/forms/FormWrapper.java +++ b/src/main/java/eu/siacs/conversations/ui/forms/FormWrapper.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.forms; +package eu.siacs.conversations.ui.forms; import android.content.Context; import android.widget.LinearLayout; @@ -6,8 +6,8 @@ import android.widget.LinearLayout; import java.util.ArrayList; import java.util.List; -import de.pixart.messenger.xmpp.forms.Data; -import de.pixart.messenger.xmpp.forms.Field; +import eu.siacs.conversations.xmpp.forms.Data; +import eu.siacs.conversations.xmpp.forms.Field; public class FormWrapper { diff --git a/src/main/java/de/pixart/messenger/ui/interfaces/OnAvatarPublication.java b/src/main/java/eu/siacs/conversations/ui/interfaces/OnAvatarPublication.java similarity index 97% rename from src/main/java/de/pixart/messenger/ui/interfaces/OnAvatarPublication.java rename to src/main/java/eu/siacs/conversations/ui/interfaces/OnAvatarPublication.java index e4b04ea63c..547cd4e25e 100644 --- a/src/main/java/de/pixart/messenger/ui/interfaces/OnAvatarPublication.java +++ b/src/main/java/eu/siacs/conversations/ui/interfaces/OnAvatarPublication.java @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.interfaces; +package eu.siacs.conversations.ui.interfaces; import androidx.annotation.StringRes; diff --git a/src/main/java/de/pixart/messenger/ui/interfaces/OnBackendConnected.java b/src/main/java/eu/siacs/conversations/ui/interfaces/OnBackendConnected.java similarity index 97% rename from src/main/java/de/pixart/messenger/ui/interfaces/OnBackendConnected.java rename to src/main/java/eu/siacs/conversations/ui/interfaces/OnBackendConnected.java index b96c5d7938..64787e7ce9 100644 --- a/src/main/java/de/pixart/messenger/ui/interfaces/OnBackendConnected.java +++ b/src/main/java/eu/siacs/conversations/ui/interfaces/OnBackendConnected.java @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.interfaces; +package eu.siacs.conversations.ui.interfaces; public interface OnBackendConnected { diff --git a/src/main/java/de/pixart/messenger/ui/interfaces/OnConversationArchived.java b/src/main/java/eu/siacs/conversations/ui/interfaces/OnConversationArchived.java similarity index 94% rename from src/main/java/de/pixart/messenger/ui/interfaces/OnConversationArchived.java rename to src/main/java/eu/siacs/conversations/ui/interfaces/OnConversationArchived.java index beb01e6903..fa281bfaa7 100644 --- a/src/main/java/de/pixart/messenger/ui/interfaces/OnConversationArchived.java +++ b/src/main/java/eu/siacs/conversations/ui/interfaces/OnConversationArchived.java @@ -27,9 +27,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.interfaces; +package eu.siacs.conversations.ui.interfaces; -import de.pixart.messenger.entities.Conversation; +import eu.siacs.conversations.entities.Conversation; public interface OnConversationArchived { void onConversationArchived(Conversation conversation); diff --git a/src/main/java/de/pixart/messenger/ui/interfaces/OnConversationRead.java b/src/main/java/eu/siacs/conversations/ui/interfaces/OnConversationRead.java similarity index 94% rename from src/main/java/de/pixart/messenger/ui/interfaces/OnConversationRead.java rename to src/main/java/eu/siacs/conversations/ui/interfaces/OnConversationRead.java index 763d139d3a..3cc2be7d6c 100644 --- a/src/main/java/de/pixart/messenger/ui/interfaces/OnConversationRead.java +++ b/src/main/java/eu/siacs/conversations/ui/interfaces/OnConversationRead.java @@ -27,9 +27,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.interfaces; +package eu.siacs.conversations.ui.interfaces; -import de.pixart.messenger.entities.Conversation; +import eu.siacs.conversations.entities.Conversation; public interface OnConversationRead { void onConversationRead(Conversation conversation, String upToUuid); diff --git a/src/main/java/de/pixart/messenger/ui/interfaces/OnConversationSelected.java b/src/main/java/eu/siacs/conversations/ui/interfaces/OnConversationSelected.java similarity index 94% rename from src/main/java/de/pixart/messenger/ui/interfaces/OnConversationSelected.java rename to src/main/java/eu/siacs/conversations/ui/interfaces/OnConversationSelected.java index bd40a22fcf..14ea9116d9 100644 --- a/src/main/java/de/pixart/messenger/ui/interfaces/OnConversationSelected.java +++ b/src/main/java/eu/siacs/conversations/ui/interfaces/OnConversationSelected.java @@ -27,9 +27,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.interfaces; +package eu.siacs.conversations.ui.interfaces; -import de.pixart.messenger.entities.Conversation; +import eu.siacs.conversations.entities.Conversation; public interface OnConversationSelected { void onConversationSelected(Conversation conversation); diff --git a/src/main/java/de/pixart/messenger/ui/interfaces/OnConversationsListItemUpdated.java b/src/main/java/eu/siacs/conversations/ui/interfaces/OnConversationsListItemUpdated.java similarity index 97% rename from src/main/java/de/pixart/messenger/ui/interfaces/OnConversationsListItemUpdated.java rename to src/main/java/eu/siacs/conversations/ui/interfaces/OnConversationsListItemUpdated.java index 5e509dd545..5e6f615662 100644 --- a/src/main/java/de/pixart/messenger/ui/interfaces/OnConversationsListItemUpdated.java +++ b/src/main/java/eu/siacs/conversations/ui/interfaces/OnConversationsListItemUpdated.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.interfaces; +package eu.siacs.conversations.ui.interfaces; public interface OnConversationsListItemUpdated { void onConversationsListItemUpdated(); diff --git a/src/main/java/de/pixart/messenger/ui/interfaces/OnMediaLoaded.java b/src/main/java/eu/siacs/conversations/ui/interfaces/OnMediaLoaded.java similarity index 54% rename from src/main/java/de/pixart/messenger/ui/interfaces/OnMediaLoaded.java rename to src/main/java/eu/siacs/conversations/ui/interfaces/OnMediaLoaded.java index 0441be96d7..288a76be9d 100644 --- a/src/main/java/de/pixart/messenger/ui/interfaces/OnMediaLoaded.java +++ b/src/main/java/eu/siacs/conversations/ui/interfaces/OnMediaLoaded.java @@ -1,8 +1,8 @@ -package de.pixart.messenger.ui.interfaces; +package eu.siacs.conversations.ui.interfaces; import java.util.List; -import de.pixart.messenger.ui.util.Attachment; +import eu.siacs.conversations.ui.util.Attachment; public interface OnMediaLoaded { diff --git a/src/main/java/de/pixart/messenger/ui/interfaces/OnSearchResultsAvailable.java b/src/main/java/eu/siacs/conversations/ui/interfaces/OnSearchResultsAvailable.java similarity index 94% rename from src/main/java/de/pixart/messenger/ui/interfaces/OnSearchResultsAvailable.java rename to src/main/java/eu/siacs/conversations/ui/interfaces/OnSearchResultsAvailable.java index b0041fd66e..5dba9614d2 100644 --- a/src/main/java/de/pixart/messenger/ui/interfaces/OnSearchResultsAvailable.java +++ b/src/main/java/eu/siacs/conversations/ui/interfaces/OnSearchResultsAvailable.java @@ -26,11 +26,11 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.interfaces; +package eu.siacs.conversations.ui.interfaces; import java.util.List; -import de.pixart.messenger.entities.Message; +import eu.siacs.conversations.entities.Message; public interface OnSearchResultsAvailable { diff --git a/src/main/java/de/pixart/messenger/ui/service/CameraManager.java b/src/main/java/eu/siacs/conversations/ui/service/CameraManager.java similarity index 99% rename from src/main/java/de/pixart/messenger/ui/service/CameraManager.java rename to src/main/java/eu/siacs/conversations/ui/service/CameraManager.java index 4e58d88cf6..b63ea052e3 100644 --- a/src/main/java/de/pixart/messenger/ui/service/CameraManager.java +++ b/src/main/java/eu/siacs/conversations/ui/service/CameraManager.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package de.pixart.messenger.ui.service; +package eu.siacs.conversations.ui.service; import android.annotation.SuppressLint; import android.graphics.Rect; @@ -34,7 +34,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import de.pixart.messenger.Config; +import eu.siacs.conversations.Config; /** * @author Andreas Schildbach diff --git a/src/main/java/de/pixart/messenger/ui/text/DividerSpan.java b/src/main/java/eu/siacs/conversations/ui/text/DividerSpan.java similarity index 93% rename from src/main/java/de/pixart/messenger/ui/text/DividerSpan.java rename to src/main/java/eu/siacs/conversations/ui/text/DividerSpan.java index 672a267bec..394e7b3cb1 100644 --- a/src/main/java/de/pixart/messenger/ui/text/DividerSpan.java +++ b/src/main/java/eu/siacs/conversations/ui/text/DividerSpan.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.text; +package eu.siacs.conversations.ui.text; import android.text.TextPaint; import android.text.style.MetricAffectingSpan; diff --git a/src/main/java/de/pixart/messenger/ui/text/FixedURLSpan.java b/src/main/java/eu/siacs/conversations/ui/text/FixedURLSpan.java similarity index 95% rename from src/main/java/de/pixart/messenger/ui/text/FixedURLSpan.java rename to src/main/java/eu/siacs/conversations/ui/text/FixedURLSpan.java index 0472cbc156..92c95b1c9f 100644 --- a/src/main/java/de/pixart/messenger/ui/text/FixedURLSpan.java +++ b/src/main/java/eu/siacs/conversations/ui/text/FixedURLSpan.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.text; +package eu.siacs.conversations.ui.text; import android.annotation.SuppressLint; import android.content.ActivityNotFoundException; @@ -43,9 +43,9 @@ import android.widget.Toast; import java.util.Arrays; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.ui.ConversationsActivity; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.ui.ConversationsActivity; import me.drakeet.support.toast.ToastCompat; @SuppressLint("ParcelCreator") diff --git a/src/main/java/de/pixart/messenger/ui/text/QuoteSpan.java b/src/main/java/eu/siacs/conversations/ui/text/QuoteSpan.java similarity index 97% rename from src/main/java/de/pixart/messenger/ui/text/QuoteSpan.java rename to src/main/java/eu/siacs/conversations/ui/text/QuoteSpan.java index 2ea005d98d..45768b8e7e 100644 --- a/src/main/java/de/pixart/messenger/ui/text/QuoteSpan.java +++ b/src/main/java/eu/siacs/conversations/ui/text/QuoteSpan.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.text; +package eu.siacs.conversations.ui.text; import android.graphics.Canvas; import android.graphics.Paint; diff --git a/src/main/java/de/pixart/messenger/ui/util/ActivityResult.java b/src/main/java/eu/siacs/conversations/ui/util/ActivityResult.java similarity index 98% rename from src/main/java/de/pixart/messenger/ui/util/ActivityResult.java rename to src/main/java/eu/siacs/conversations/ui/util/ActivityResult.java index b9c4b28703..45e2917b8a 100644 --- a/src/main/java/de/pixart/messenger/ui/util/ActivityResult.java +++ b/src/main/java/eu/siacs/conversations/ui/util/ActivityResult.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; import android.content.Intent; diff --git a/src/main/java/de/pixart/messenger/ui/util/Attachment.java b/src/main/java/eu/siacs/conversations/ui/util/Attachment.java similarity index 97% rename from src/main/java/de/pixart/messenger/ui/util/Attachment.java rename to src/main/java/eu/siacs/conversations/ui/util/Attachment.java index ed4f5040af..c1d190b046 100644 --- a/src/main/java/de/pixart/messenger/ui/util/Attachment.java +++ b/src/main/java/eu/siacs/conversations/ui/util/Attachment.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; import android.content.ClipData; import android.content.Context; @@ -43,8 +43,8 @@ import java.util.Collections; import java.util.List; import java.util.UUID; -import de.pixart.messenger.Config; -import de.pixart.messenger.utils.MimeUtils; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.utils.MimeUtils; public class Attachment implements Parcelable { public static final Creator CREATOR = new Parcelable.Creator() { diff --git a/src/main/java/de/pixart/messenger/ui/util/AvatarWorkerTask.java b/src/main/java/eu/siacs/conversations/ui/util/AvatarWorkerTask.java similarity index 96% rename from src/main/java/de/pixart/messenger/ui/util/AvatarWorkerTask.java rename to src/main/java/eu/siacs/conversations/ui/util/AvatarWorkerTask.java index 97519eccd4..61183ef845 100644 --- a/src/main/java/de/pixart/messenger/ui/util/AvatarWorkerTask.java +++ b/src/main/java/eu/siacs/conversations/ui/util/AvatarWorkerTask.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; import android.content.res.Resources; import android.graphics.Bitmap; @@ -12,9 +12,9 @@ import androidx.annotation.DimenRes; import java.lang.ref.WeakReference; import java.util.concurrent.RejectedExecutionException; -import de.pixart.messenger.R; -import de.pixart.messenger.services.AvatarService; -import de.pixart.messenger.ui.XmppActivity; +import eu.siacs.conversations.R; +import eu.siacs.conversations.services.AvatarService; +import eu.siacs.conversations.ui.XmppActivity; public class AvatarWorkerTask extends AsyncTask { private final WeakReference imageViewReference; diff --git a/src/main/java/de/pixart/messenger/ui/util/ChangeWatcher.java b/src/main/java/eu/siacs/conversations/ui/util/ChangeWatcher.java similarity index 97% rename from src/main/java/de/pixart/messenger/ui/util/ChangeWatcher.java rename to src/main/java/eu/siacs/conversations/ui/util/ChangeWatcher.java index 5277a42bf6..7c5d5014bd 100644 --- a/src/main/java/de/pixart/messenger/ui/util/ChangeWatcher.java +++ b/src/main/java/eu/siacs/conversations/ui/util/ChangeWatcher.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; public class ChangeWatcher { diff --git a/src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java b/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java similarity index 94% rename from src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java rename to src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java index 8a9434622f..d90d193976 100644 --- a/src/main/java/de/pixart/messenger/ui/util/ConversationMenuConfigurator.java +++ b/src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; import android.app.Activity; import android.content.Context; @@ -37,13 +37,13 @@ import android.view.MenuItem; import androidx.annotation.NonNull; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.crypto.OmemoSetting; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.Conversational; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.ui.XmppActivity; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.crypto.OmemoSetting; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Conversational; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.ui.XmppActivity; public class ConversationMenuConfigurator { diff --git a/src/main/java/de/pixart/messenger/ui/util/DateSeparator.java b/src/main/java/eu/siacs/conversations/ui/util/DateSeparator.java similarity index 91% rename from src/main/java/de/pixart/messenger/ui/util/DateSeparator.java rename to src/main/java/eu/siacs/conversations/ui/util/DateSeparator.java index 74633f62b8..b9bf04cd32 100644 --- a/src/main/java/de/pixart/messenger/ui/util/DateSeparator.java +++ b/src/main/java/eu/siacs/conversations/ui/util/DateSeparator.java @@ -26,13 +26,13 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; import java.util.List; -import de.pixart.messenger.entities.IndividualMessage; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.utils.UIHelper; +import eu.siacs.conversations.entities.IndividualMessage; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.utils.UIHelper; public class DateSeparator { diff --git a/src/main/java/de/pixart/messenger/ui/util/DelayedHintHelper.java b/src/main/java/eu/siacs/conversations/ui/util/DelayedHintHelper.java similarity index 98% rename from src/main/java/de/pixart/messenger/ui/util/DelayedHintHelper.java rename to src/main/java/eu/siacs/conversations/ui/util/DelayedHintHelper.java index c3bbcf2fab..a36229f6c0 100644 --- a/src/main/java/de/pixart/messenger/ui/util/DelayedHintHelper.java +++ b/src/main/java/eu/siacs/conversations/ui/util/DelayedHintHelper.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; import android.os.Handler; import android.widget.EditText; diff --git a/src/main/java/de/pixart/messenger/ui/util/EditMessageActionModeCallback.java b/src/main/java/eu/siacs/conversations/ui/util/EditMessageActionModeCallback.java similarity index 96% rename from src/main/java/de/pixart/messenger/ui/util/EditMessageActionModeCallback.java rename to src/main/java/eu/siacs/conversations/ui/util/EditMessageActionModeCallback.java index 79914001af..e91336443c 100644 --- a/src/main/java/de/pixart/messenger/ui/util/EditMessageActionModeCallback.java +++ b/src/main/java/eu/siacs/conversations/ui/util/EditMessageActionModeCallback.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; import android.content.ClipData; import android.content.ClipboardManager; @@ -38,8 +38,8 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import de.pixart.messenger.R; -import de.pixart.messenger.ui.widget.EditMessage; +import eu.siacs.conversations.R; +import eu.siacs.conversations.ui.widget.EditMessage; public class EditMessageActionModeCallback implements ActionMode.Callback { diff --git a/src/main/java/de/pixart/messenger/ui/util/GridManager.java b/src/main/java/eu/siacs/conversations/ui/util/GridManager.java similarity index 96% rename from src/main/java/de/pixart/messenger/ui/util/GridManager.java rename to src/main/java/eu/siacs/conversations/ui/util/GridManager.java index 037b2553af..2f71d75ab8 100644 --- a/src/main/java/de/pixart/messenger/ui/util/GridManager.java +++ b/src/main/java/eu/siacs/conversations/ui/util/GridManager.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; import android.content.Context; import android.util.Log; @@ -8,8 +8,8 @@ import androidx.annotation.DimenRes; import androidx.recyclerview.widget.GridLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import de.pixart.messenger.Config; -import de.pixart.messenger.ui.adapter.MediaAdapter; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.ui.adapter.MediaAdapter; public class GridManager { diff --git a/src/main/java/de/pixart/messenger/ui/util/IntroHelper.java b/src/main/java/eu/siacs/conversations/ui/util/IntroHelper.java similarity index 84% rename from src/main/java/de/pixart/messenger/ui/util/IntroHelper.java rename to src/main/java/eu/siacs/conversations/ui/util/IntroHelper.java index f4a593739d..98815f9657 100644 --- a/src/main/java/de/pixart/messenger/ui/util/IntroHelper.java +++ b/src/main/java/eu/siacs/conversations/ui/util/IntroHelper.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; import android.app.Activity; import android.content.Context; @@ -6,11 +6,11 @@ import android.content.Intent; import android.content.SharedPreferences; import android.preference.PreferenceManager; -import de.pixart.messenger.Config; -import de.pixart.messenger.ui.IntroActivity; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.ui.IntroActivity; -import static de.pixart.messenger.ui.IntroActivity.ACTIVITY; -import static de.pixart.messenger.ui.IntroActivity.MULTICHAT; +import static eu.siacs.conversations.ui.IntroActivity.ACTIVITY; +import static eu.siacs.conversations.ui.IntroActivity.MULTICHAT; public class IntroHelper { public static void showIntro(Activity activity, boolean mode_multi) { diff --git a/src/main/java/de/pixart/messenger/ui/util/JidDialog.java b/src/main/java/eu/siacs/conversations/ui/util/JidDialog.java similarity index 94% rename from src/main/java/de/pixart/messenger/ui/util/JidDialog.java rename to src/main/java/eu/siacs/conversations/ui/util/JidDialog.java index 0b90fd5361..c506be5133 100644 --- a/src/main/java/de/pixart/messenger/ui/util/JidDialog.java +++ b/src/main/java/eu/siacs/conversations/ui/util/JidDialog.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; import android.content.Context; import android.text.SpannableString; diff --git a/src/main/java/de/pixart/messenger/ui/util/ListViewUtils.java b/src/main/java/eu/siacs/conversations/ui/util/ListViewUtils.java similarity index 98% rename from src/main/java/de/pixart/messenger/ui/util/ListViewUtils.java rename to src/main/java/eu/siacs/conversations/ui/util/ListViewUtils.java index b797877e4c..2a4463a2d4 100644 --- a/src/main/java/de/pixart/messenger/ui/util/ListViewUtils.java +++ b/src/main/java/eu/siacs/conversations/ui/util/ListViewUtils.java @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; import android.view.View; import android.widget.ListView; diff --git a/src/main/java/de/pixart/messenger/ui/util/MucConfiguration.java b/src/main/java/eu/siacs/conversations/ui/util/MucConfiguration.java similarity index 97% rename from src/main/java/de/pixart/messenger/ui/util/MucConfiguration.java rename to src/main/java/eu/siacs/conversations/ui/util/MucConfiguration.java index fdda031dfe..7201eb1e45 100644 --- a/src/main/java/de/pixart/messenger/ui/util/MucConfiguration.java +++ b/src/main/java/eu/siacs/conversations/ui/util/MucConfiguration.java @@ -1,12 +1,12 @@ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; import android.content.Context; import android.os.Bundle; import androidx.annotation.StringRes; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.MucOptions; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.MucOptions; public class MucConfiguration { diff --git a/src/main/java/de/pixart/messenger/ui/util/MucDetailsContextMenuHelper.java b/src/main/java/eu/siacs/conversations/ui/util/MucDetailsContextMenuHelper.java similarity index 95% rename from src/main/java/de/pixart/messenger/ui/util/MucDetailsContextMenuHelper.java rename to src/main/java/eu/siacs/conversations/ui/util/MucDetailsContextMenuHelper.java index 10f14bf4fc..eb48a96cd4 100644 --- a/src/main/java/de/pixart/messenger/ui/util/MucDetailsContextMenuHelper.java +++ b/src/main/java/eu/siacs/conversations/ui/util/MucDetailsContextMenuHelper.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; import android.app.Activity; import android.graphics.Color; @@ -19,20 +19,20 @@ import android.widget.ImageView; import androidx.appcompat.app.AlertDialog; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.MucOptions; -import de.pixart.messenger.entities.MucOptions.User; -import de.pixart.messenger.entities.RawBlockable; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.ui.ConferenceDetailsActivity; -import de.pixart.messenger.ui.ConversationFragment; -import de.pixart.messenger.ui.ConversationsActivity; -import de.pixart.messenger.ui.MucUsersActivity; -import de.pixart.messenger.ui.XmppActivity; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.MucOptions; +import eu.siacs.conversations.entities.MucOptions.User; +import eu.siacs.conversations.entities.RawBlockable; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.ui.ConferenceDetailsActivity; +import eu.siacs.conversations.ui.ConversationFragment; +import eu.siacs.conversations.ui.ConversationsActivity; +import eu.siacs.conversations.ui.MucUsersActivity; +import eu.siacs.conversations.ui.XmppActivity; import rocks.xmpp.addr.Jid; public final class MucDetailsContextMenuHelper { diff --git a/src/main/java/de/pixart/messenger/ui/util/MyLinkify.java b/src/main/java/eu/siacs/conversations/ui/util/MyLinkify.java similarity index 94% rename from src/main/java/de/pixart/messenger/ui/util/MyLinkify.java rename to src/main/java/eu/siacs/conversations/ui/util/MyLinkify.java index 3c3c12da3b..4a18fa4868 100644 --- a/src/main/java/de/pixart/messenger/ui/util/MyLinkify.java +++ b/src/main/java/eu/siacs/conversations/ui/util/MyLinkify.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; import android.content.Context; import android.content.SharedPreferences; @@ -41,13 +41,13 @@ import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.ui.SettingsActivity; -import de.pixart.messenger.ui.text.FixedURLSpan; -import de.pixart.messenger.utils.GeoHelper; -import de.pixart.messenger.utils.Patterns; -import de.pixart.messenger.utils.XmppUri; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.ui.SettingsActivity; +import eu.siacs.conversations.ui.text.FixedURLSpan; +import eu.siacs.conversations.utils.GeoHelper; +import eu.siacs.conversations.utils.Patterns; +import eu.siacs.conversations.utils.XmppUri; public class MyLinkify { diff --git a/src/main/java/de/pixart/messenger/ui/util/PendingActionHelper.java b/src/main/java/eu/siacs/conversations/ui/util/PendingActionHelper.java similarity index 92% rename from src/main/java/de/pixart/messenger/ui/util/PendingActionHelper.java rename to src/main/java/eu/siacs/conversations/ui/util/PendingActionHelper.java index 06c2917112..aa73c186b9 100644 --- a/src/main/java/de/pixart/messenger/ui/util/PendingActionHelper.java +++ b/src/main/java/eu/siacs/conversations/ui/util/PendingActionHelper.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; /** * Created by mxf on 2018/4/3. diff --git a/src/main/java/de/pixart/messenger/ui/util/PendingItem.java b/src/main/java/eu/siacs/conversations/ui/util/PendingItem.java similarity index 98% rename from src/main/java/de/pixart/messenger/ui/util/PendingItem.java rename to src/main/java/eu/siacs/conversations/ui/util/PendingItem.java index d06f5bfc94..44a016afa4 100644 --- a/src/main/java/de/pixart/messenger/ui/util/PendingItem.java +++ b/src/main/java/eu/siacs/conversations/ui/util/PendingItem.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; public class PendingItem { diff --git a/src/main/java/de/pixart/messenger/ui/util/PresenceSelector.java b/src/main/java/eu/siacs/conversations/ui/util/PresenceSelector.java similarity index 95% rename from src/main/java/de/pixart/messenger/ui/util/PresenceSelector.java rename to src/main/java/eu/siacs/conversations/ui/util/PresenceSelector.java index a22ec17402..b81108211e 100644 --- a/src/main/java/de/pixart/messenger/ui/util/PresenceSelector.java +++ b/src/main/java/eu/siacs/conversations/ui/util/PresenceSelector.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; import android.app.Activity; import androidx.appcompat.app.AlertDialog; @@ -38,11 +38,11 @@ import java.util.Collections; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.Presences; -import de.pixart.messenger.utils.CryptoHelper; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Presences; +import eu.siacs.conversations.utils.CryptoHelper; import rocks.xmpp.addr.Jid; public class PresenceSelector { diff --git a/src/main/java/de/pixart/messenger/ui/util/ScrollState.java b/src/main/java/eu/siacs/conversations/ui/util/ScrollState.java similarity index 98% rename from src/main/java/de/pixart/messenger/ui/util/ScrollState.java rename to src/main/java/eu/siacs/conversations/ui/util/ScrollState.java index 3a0e87900c..4f37c87ae8 100644 --- a/src/main/java/de/pixart/messenger/ui/util/ScrollState.java +++ b/src/main/java/eu/siacs/conversations/ui/util/ScrollState.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; import android.os.Parcel; import android.os.Parcelable; diff --git a/src/main/java/de/pixart/messenger/ui/util/SendButtonAction.java b/src/main/java/eu/siacs/conversations/ui/util/SendButtonAction.java similarity index 85% rename from src/main/java/de/pixart/messenger/ui/util/SendButtonAction.java rename to src/main/java/eu/siacs/conversations/ui/util/SendButtonAction.java index 00e82fd929..3ca63c1d35 100644 --- a/src/main/java/de/pixart/messenger/ui/util/SendButtonAction.java +++ b/src/main/java/eu/siacs/conversations/ui/util/SendButtonAction.java @@ -27,14 +27,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; -import static de.pixart.messenger.ui.ConversationFragment.ATTACHMENT_CHOICE; -import static de.pixart.messenger.ui.ConversationFragment.ATTACHMENT_CHOICE_CHOOSE_IMAGE; -import static de.pixart.messenger.ui.ConversationFragment.ATTACHMENT_CHOICE_LOCATION; -import static de.pixart.messenger.ui.ConversationFragment.ATTACHMENT_CHOICE_RECORD_VIDEO; -import static de.pixart.messenger.ui.ConversationFragment.ATTACHMENT_CHOICE_RECORD_VOICE; -import static de.pixart.messenger.ui.ConversationFragment.ATTACHMENT_CHOICE_TAKE_PHOTO; +import static eu.siacs.conversations.ui.ConversationFragment.ATTACHMENT_CHOICE; +import static eu.siacs.conversations.ui.ConversationFragment.ATTACHMENT_CHOICE_CHOOSE_IMAGE; +import static eu.siacs.conversations.ui.ConversationFragment.ATTACHMENT_CHOICE_LOCATION; +import static eu.siacs.conversations.ui.ConversationFragment.ATTACHMENT_CHOICE_RECORD_VIDEO; +import static eu.siacs.conversations.ui.ConversationFragment.ATTACHMENT_CHOICE_RECORD_VOICE; +import static eu.siacs.conversations.ui.ConversationFragment.ATTACHMENT_CHOICE_TAKE_PHOTO; public enum SendButtonAction { TEXT, TAKE_PHOTO, SEND_LOCATION, RECORD_VOICE, CANCEL, CHOOSE_PICTURE, RECORD_VIDEO, CHOOSE_ATTACHMENT; diff --git a/src/main/java/de/pixart/messenger/ui/util/SendButtonTool.java b/src/main/java/eu/siacs/conversations/ui/util/SendButtonTool.java similarity index 96% rename from src/main/java/de/pixart/messenger/ui/util/SendButtonTool.java rename to src/main/java/eu/siacs/conversations/ui/util/SendButtonTool.java index 2c9307323b..e49b183261 100644 --- a/src/main/java/de/pixart/messenger/ui/util/SendButtonTool.java +++ b/src/main/java/eu/siacs/conversations/ui/util/SendButtonTool.java @@ -27,19 +27,19 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; import android.app.Activity; import android.content.SharedPreferences; import android.content.res.TypedArray; import android.preference.PreferenceManager; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.Presence; -import de.pixart.messenger.ui.ConversationFragment; -import de.pixart.messenger.ui.SettingsActivity; -import de.pixart.messenger.utils.UIHelper; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Presence; +import eu.siacs.conversations.ui.ConversationFragment; +import eu.siacs.conversations.ui.SettingsActivity; +import eu.siacs.conversations.utils.UIHelper; public class SendButtonTool { diff --git a/src/main/java/de/pixart/messenger/ui/util/ShareUtil.java b/src/main/java/eu/siacs/conversations/ui/util/ShareUtil.java similarity index 93% rename from src/main/java/de/pixart/messenger/ui/util/ShareUtil.java rename to src/main/java/eu/siacs/conversations/ui/util/ShareUtil.java index e73109b027..a4b1f32766 100644 --- a/src/main/java/de/pixart/messenger/ui/util/ShareUtil.java +++ b/src/main/java/eu/siacs/conversations/ui/util/ShareUtil.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; import android.content.ActivityNotFoundException; import android.content.Intent; @@ -35,14 +35,14 @@ import android.widget.Toast; import java.util.regex.Matcher; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.DownloadableFile; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.persistance.FileBackend; -import de.pixart.messenger.ui.ConversationsActivity; -import de.pixart.messenger.ui.XmppActivity; -import de.pixart.messenger.utils.Patterns; -import de.pixart.messenger.utils.XmppUri; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.DownloadableFile; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.ui.ConversationsActivity; +import eu.siacs.conversations.ui.XmppActivity; +import eu.siacs.conversations.utils.Patterns; +import eu.siacs.conversations.utils.XmppUri; import me.drakeet.support.toast.ToastCompat; import rocks.xmpp.addr.Jid; diff --git a/src/main/java/de/pixart/messenger/ui/util/SoftKeyboardUtils.java b/src/main/java/eu/siacs/conversations/ui/util/SoftKeyboardUtils.java similarity index 98% rename from src/main/java/de/pixart/messenger/ui/util/SoftKeyboardUtils.java rename to src/main/java/eu/siacs/conversations/ui/util/SoftKeyboardUtils.java index d635ed278a..cd4d086bf6 100644 --- a/src/main/java/de/pixart/messenger/ui/util/SoftKeyboardUtils.java +++ b/src/main/java/eu/siacs/conversations/ui/util/SoftKeyboardUtils.java @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; import android.app.Activity; import android.content.Context; diff --git a/src/main/java/de/pixart/messenger/ui/util/StyledAttributes.java b/src/main/java/eu/siacs/conversations/ui/util/StyledAttributes.java similarity index 98% rename from src/main/java/de/pixart/messenger/ui/util/StyledAttributes.java rename to src/main/java/eu/siacs/conversations/ui/util/StyledAttributes.java index efd2aa4671..0e162cfa77 100644 --- a/src/main/java/de/pixart/messenger/ui/util/StyledAttributes.java +++ b/src/main/java/eu/siacs/conversations/ui/util/StyledAttributes.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; import android.content.Context; diff --git a/src/main/java/de/pixart/messenger/ui/util/ViewUtil.java b/src/main/java/eu/siacs/conversations/ui/util/ViewUtil.java similarity index 91% rename from src/main/java/de/pixart/messenger/ui/util/ViewUtil.java rename to src/main/java/eu/siacs/conversations/ui/util/ViewUtil.java index 4a9251832d..8df5036967 100644 --- a/src/main/java/de/pixart/messenger/ui/util/ViewUtil.java +++ b/src/main/java/eu/siacs/conversations/ui/util/ViewUtil.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.util; +package eu.siacs.conversations.ui.util; import android.content.ActivityNotFoundException; import android.content.Context; @@ -12,11 +12,11 @@ import android.widget.Toast; import java.io.File; import java.util.List; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.DownloadableFile; -import de.pixart.messenger.persistance.FileBackend; -import de.pixart.messenger.ui.MediaViewerActivity; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.DownloadableFile; +import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.ui.MediaViewerActivity; import me.drakeet.support.toast.ToastCompat; public class ViewUtil { diff --git a/src/main/java/de/pixart/messenger/ui/widget/ClickableMovementMethod.java b/src/main/java/eu/siacs/conversations/ui/widget/ClickableMovementMethod.java similarity index 97% rename from src/main/java/de/pixart/messenger/ui/widget/ClickableMovementMethod.java rename to src/main/java/eu/siacs/conversations/ui/widget/ClickableMovementMethod.java index c399a7864f..01c32b6753 100644 --- a/src/main/java/de/pixart/messenger/ui/widget/ClickableMovementMethod.java +++ b/src/main/java/eu/siacs/conversations/ui/widget/ClickableMovementMethod.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.widget; +package eu.siacs.conversations.ui.widget; import android.text.Layout; import android.text.Spannable; diff --git a/src/main/java/de/pixart/messenger/ui/widget/CopyTextView.java b/src/main/java/eu/siacs/conversations/ui/widget/CopyTextView.java similarity index 97% rename from src/main/java/de/pixart/messenger/ui/widget/CopyTextView.java rename to src/main/java/eu/siacs/conversations/ui/widget/CopyTextView.java index 8db6e774aa..7ef4a74a4c 100644 --- a/src/main/java/de/pixart/messenger/ui/widget/CopyTextView.java +++ b/src/main/java/eu/siacs/conversations/ui/widget/CopyTextView.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.widget; +package eu.siacs.conversations.ui.widget; import android.annotation.SuppressLint; import android.content.ClipData; diff --git a/src/main/java/de/pixart/messenger/ui/widget/DisabledActionModeCallback.java b/src/main/java/eu/siacs/conversations/ui/widget/DisabledActionModeCallback.java similarity index 98% rename from src/main/java/de/pixart/messenger/ui/widget/DisabledActionModeCallback.java rename to src/main/java/eu/siacs/conversations/ui/widget/DisabledActionModeCallback.java index 5acf3a6669..861859d9c2 100644 --- a/src/main/java/de/pixart/messenger/ui/widget/DisabledActionModeCallback.java +++ b/src/main/java/eu/siacs/conversations/ui/widget/DisabledActionModeCallback.java @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.widget; +package eu.siacs.conversations.ui.widget; import android.view.ActionMode; import android.view.Menu; diff --git a/src/main/java/de/pixart/messenger/ui/widget/EditMessage.java b/src/main/java/eu/siacs/conversations/ui/widget/EditMessage.java similarity index 98% rename from src/main/java/de/pixart/messenger/ui/widget/EditMessage.java rename to src/main/java/eu/siacs/conversations/ui/widget/EditMessage.java index f0e9dbb4ff..19d7709bfc 100644 --- a/src/main/java/de/pixart/messenger/ui/widget/EditMessage.java +++ b/src/main/java/eu/siacs/conversations/ui/widget/EditMessage.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.widget; +package eu.siacs.conversations.ui.widget; import android.content.Context; import android.content.SharedPreferences; @@ -22,8 +22,8 @@ import androidx.core.view.inputmethod.InputContentInfoCompat; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; public class EditMessage extends EmojiWrapperEditText { diff --git a/src/main/java/de/pixart/messenger/ui/widget/FailedCountCustomView.java b/src/main/java/eu/siacs/conversations/ui/widget/FailedCountCustomView.java similarity index 97% rename from src/main/java/de/pixart/messenger/ui/widget/FailedCountCustomView.java rename to src/main/java/eu/siacs/conversations/ui/widget/FailedCountCustomView.java index 3130479eaf..bf9f0a2080 100644 --- a/src/main/java/de/pixart/messenger/ui/widget/FailedCountCustomView.java +++ b/src/main/java/eu/siacs/conversations/ui/widget/FailedCountCustomView.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.widget; +package eu.siacs.conversations.ui.widget; import android.content.Context; import android.content.res.TypedArray; @@ -11,7 +11,7 @@ import android.view.View; import androidx.core.content.ContextCompat; -import de.pixart.messenger.R; +import eu.siacs.conversations.R; public class FailedCountCustomView extends View { diff --git a/src/main/java/de/pixart/messenger/ui/widget/ImmediateAutoCompleteTextView.java b/src/main/java/eu/siacs/conversations/ui/widget/ImmediateAutoCompleteTextView.java similarity index 97% rename from src/main/java/de/pixart/messenger/ui/widget/ImmediateAutoCompleteTextView.java rename to src/main/java/eu/siacs/conversations/ui/widget/ImmediateAutoCompleteTextView.java index fb5a0391ec..e12d998206 100644 --- a/src/main/java/de/pixart/messenger/ui/widget/ImmediateAutoCompleteTextView.java +++ b/src/main/java/eu/siacs/conversations/ui/widget/ImmediateAutoCompleteTextView.java @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.ui.widget; +package eu.siacs.conversations.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/src/main/java/de/pixart/messenger/ui/widget/ListSelectionManager.java b/src/main/java/eu/siacs/conversations/ui/widget/ListSelectionManager.java similarity index 99% rename from src/main/java/de/pixart/messenger/ui/widget/ListSelectionManager.java rename to src/main/java/eu/siacs/conversations/ui/widget/ListSelectionManager.java index eb2136b78f..7b1e850f9c 100644 --- a/src/main/java/de/pixart/messenger/ui/widget/ListSelectionManager.java +++ b/src/main/java/eu/siacs/conversations/ui/widget/ListSelectionManager.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.widget; +package eu.siacs.conversations.ui.widget; import android.os.Handler; import android.os.Looper; diff --git a/src/main/java/de/pixart/messenger/ui/widget/RichLinkView.java b/src/main/java/eu/siacs/conversations/ui/widget/RichLinkView.java similarity index 96% rename from src/main/java/de/pixart/messenger/ui/widget/RichLinkView.java rename to src/main/java/eu/siacs/conversations/ui/widget/RichLinkView.java index 85310d27f4..0c15e60bf0 100644 --- a/src/main/java/de/pixart/messenger/ui/widget/RichLinkView.java +++ b/src/main/java/eu/siacs/conversations/ui/widget/RichLinkView.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.widget; +package eu.siacs.conversations.ui.widget; import android.content.ActivityNotFoundException; import android.content.Context; @@ -17,10 +17,10 @@ import androidx.annotation.RequiresApi; import com.squareup.picasso.Picasso; -import de.pixart.messenger.R; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.utils.MetaData; -import de.pixart.messenger.utils.RichPreview; +import eu.siacs.conversations.R; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.utils.MetaData; +import eu.siacs.conversations.utils.RichPreview; import me.drakeet.support.toast.ToastCompat; diff --git a/src/main/java/de/pixart/messenger/ui/widget/ScannerView.java b/src/main/java/eu/siacs/conversations/ui/widget/ScannerView.java similarity index 98% rename from src/main/java/de/pixart/messenger/ui/widget/ScannerView.java rename to src/main/java/eu/siacs/conversations/ui/widget/ScannerView.java index 25b1f9f259..0cef7815c1 100644 --- a/src/main/java/de/pixart/messenger/ui/widget/ScannerView.java +++ b/src/main/java/eu/siacs/conversations/ui/widget/ScannerView.java @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package de.pixart.messenger.ui.widget; +package eu.siacs.conversations.ui.widget; import android.content.Context; import android.content.res.Resources; @@ -35,7 +35,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import de.pixart.messenger.R; +import eu.siacs.conversations.R; /** * @author Andreas Schildbach diff --git a/src/main/java/de/pixart/messenger/ui/widget/SquareFrameLayout.java b/src/main/java/eu/siacs/conversations/ui/widget/SquareFrameLayout.java similarity index 94% rename from src/main/java/de/pixart/messenger/ui/widget/SquareFrameLayout.java rename to src/main/java/eu/siacs/conversations/ui/widget/SquareFrameLayout.java index 4d2fcf92d4..38e548fd68 100644 --- a/src/main/java/de/pixart/messenger/ui/widget/SquareFrameLayout.java +++ b/src/main/java/eu/siacs/conversations/ui/widget/SquareFrameLayout.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.widget; +package eu.siacs.conversations.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/src/main/java/de/pixart/messenger/ui/widget/TextInputEditText.java b/src/main/java/eu/siacs/conversations/ui/widget/TextInputEditText.java similarity index 97% rename from src/main/java/de/pixart/messenger/ui/widget/TextInputEditText.java rename to src/main/java/eu/siacs/conversations/ui/widget/TextInputEditText.java index 62f384d90f..96b8254277 100644 --- a/src/main/java/de/pixart/messenger/ui/widget/TextInputEditText.java +++ b/src/main/java/eu/siacs/conversations/ui/widget/TextInputEditText.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.widget; +package eu.siacs.conversations.ui.widget; import android.content.Context; import android.os.Build; diff --git a/src/main/java/de/pixart/messenger/ui/widget/UnreadCountCustomView.java b/src/main/java/eu/siacs/conversations/ui/widget/UnreadCountCustomView.java similarity index 95% rename from src/main/java/de/pixart/messenger/ui/widget/UnreadCountCustomView.java rename to src/main/java/eu/siacs/conversations/ui/widget/UnreadCountCustomView.java index e00d79636b..459dcf5fcb 100644 --- a/src/main/java/de/pixart/messenger/ui/widget/UnreadCountCustomView.java +++ b/src/main/java/eu/siacs/conversations/ui/widget/UnreadCountCustomView.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.widget; +package eu.siacs.conversations.ui.widget; import android.content.Context; import android.content.res.TypedArray; @@ -9,8 +9,8 @@ import android.graphics.Typeface; import android.util.AttributeSet; import android.view.View; -import de.pixart.messenger.R; -import de.pixart.messenger.ui.util.StyledAttributes; +import eu.siacs.conversations.R; +import eu.siacs.conversations.ui.util.StyledAttributes; public class UnreadCountCustomView extends View { diff --git a/src/main/java/de/pixart/messenger/utils/AccountUtils.java b/src/main/java/eu/siacs/conversations/utils/AccountUtils.java similarity index 88% rename from src/main/java/de/pixart/messenger/utils/AccountUtils.java rename to src/main/java/eu/siacs/conversations/utils/AccountUtils.java index 7b78ce7613..8350e573a5 100644 --- a/src/main/java/de/pixart/messenger/utils/AccountUtils.java +++ b/src/main/java/eu/siacs/conversations/utils/AccountUtils.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.app.Activity; import android.content.Intent; @@ -7,10 +7,10 @@ import android.widget.Toast; import java.util.ArrayList; import java.util.List; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.services.XmppConnectionService; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.services.XmppConnectionService; import me.drakeet.support.toast.ToastCompat; public class AccountUtils { @@ -75,7 +75,7 @@ public class AccountUtils { private static Class getManageAccountActivityClass() { try { - return Class.forName("de.pixart.messenger.ui.ManageAccountActivity"); + return Class.forName("eu.siacs.conversations.ui.ManageAccountActivity"); } catch (ClassNotFoundException e) { return null; } diff --git a/src/main/java/de/pixart/messenger/utils/AndroidUsingExecLowPriority.java b/src/main/java/eu/siacs/conversations/utils/AndroidUsingExecLowPriority.java similarity index 98% rename from src/main/java/de/pixart/messenger/utils/AndroidUsingExecLowPriority.java rename to src/main/java/eu/siacs/conversations/utils/AndroidUsingExecLowPriority.java index 6097fcd03f..d6c4210494 100644 --- a/src/main/java/de/pixart/messenger/utils/AndroidUsingExecLowPriority.java +++ b/src/main/java/eu/siacs/conversations/utils/AndroidUsingExecLowPriority.java @@ -9,7 +9,7 @@ * the Apache License 2.0, the LGPL 2.1+ or the WTFPL. */ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/de/pixart/messenger/utils/AndroidUsingLinkProperties.java b/src/main/java/eu/siacs/conversations/utils/AndroidUsingLinkProperties.java similarity index 98% rename from src/main/java/de/pixart/messenger/utils/AndroidUsingLinkProperties.java rename to src/main/java/eu/siacs/conversations/utils/AndroidUsingLinkProperties.java index f2f33dc1b9..49efe536f6 100644 --- a/src/main/java/de/pixart/messenger/utils/AndroidUsingLinkProperties.java +++ b/src/main/java/eu/siacs/conversations/utils/AndroidUsingLinkProperties.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.annotation.TargetApi; import android.content.Context; diff --git a/src/main/java/de/pixart/messenger/utils/BackupFileHeader.java b/src/main/java/eu/siacs/conversations/utils/BackupFileHeader.java similarity index 98% rename from src/main/java/de/pixart/messenger/utils/BackupFileHeader.java rename to src/main/java/eu/siacs/conversations/utils/BackupFileHeader.java index 19ad9bff91..0c81c802ea 100644 --- a/src/main/java/de/pixart/messenger/utils/BackupFileHeader.java +++ b/src/main/java/eu/siacs/conversations/utils/BackupFileHeader.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/de/pixart/messenger/utils/Cancellable.java b/src/main/java/eu/siacs/conversations/utils/Cancellable.java similarity index 97% rename from src/main/java/de/pixart/messenger/utils/Cancellable.java rename to src/main/java/eu/siacs/conversations/utils/Cancellable.java index 73da4422d1..281380686f 100644 --- a/src/main/java/de/pixart/messenger/utils/Cancellable.java +++ b/src/main/java/eu/siacs/conversations/utils/Cancellable.java @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; public interface Cancellable { diff --git a/src/main/java/de/pixart/messenger/utils/CharSequenceUtils.java b/src/main/java/eu/siacs/conversations/utils/CharSequenceUtils.java similarity index 98% rename from src/main/java/de/pixart/messenger/utils/CharSequenceUtils.java rename to src/main/java/eu/siacs/conversations/utils/CharSequenceUtils.java index 7a9d2f1fb9..25e52f53fc 100644 --- a/src/main/java/de/pixart/messenger/utils/CharSequenceUtils.java +++ b/src/main/java/eu/siacs/conversations/utils/CharSequenceUtils.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.text.Spannable; diff --git a/src/main/java/de/pixart/messenger/utils/Checksum.java b/src/main/java/eu/siacs/conversations/utils/Checksum.java similarity index 98% rename from src/main/java/de/pixart/messenger/utils/Checksum.java rename to src/main/java/eu/siacs/conversations/utils/Checksum.java index 25f711fccc..20415e0986 100644 --- a/src/main/java/de/pixart/messenger/utils/Checksum.java +++ b/src/main/java/eu/siacs/conversations/utils/Checksum.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.util.Base64; diff --git a/src/main/java/de/pixart/messenger/utils/Compatibility.java b/src/main/java/eu/siacs/conversations/utils/Compatibility.java similarity index 95% rename from src/main/java/de/pixart/messenger/utils/Compatibility.java rename to src/main/java/eu/siacs/conversations/utils/Compatibility.java index 96a72fa232..6220061965 100644 --- a/src/main/java/de/pixart/messenger/utils/Compatibility.java +++ b/src/main/java/eu/siacs/conversations/utils/Compatibility.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.Manifest; import android.content.Context; @@ -20,12 +20,12 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.ui.SettingsActivity; -import de.pixart.messenger.ui.SettingsFragment; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.ui.SettingsActivity; +import eu.siacs.conversations.ui.SettingsFragment; -import static de.pixart.messenger.services.EventReceiver.EXTRA_NEEDS_FOREGROUND_SERVICE; +import static eu.siacs.conversations.services.EventReceiver.EXTRA_NEEDS_FOREGROUND_SERVICE; public class Compatibility { private static final List UNUSED_SETTINGS_POST_TWENTYSIX = Arrays.asList( diff --git a/src/main/java/de/pixart/messenger/utils/ConversationsFileObserver.java b/src/main/java/eu/siacs/conversations/utils/ConversationsFileObserver.java similarity index 97% rename from src/main/java/de/pixart/messenger/utils/ConversationsFileObserver.java rename to src/main/java/eu/siacs/conversations/utils/ConversationsFileObserver.java index 5e2948b5bb..531da0314d 100644 --- a/src/main/java/de/pixart/messenger/utils/ConversationsFileObserver.java +++ b/src/main/java/eu/siacs/conversations/utils/ConversationsFileObserver.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.os.FileObserver; @@ -10,7 +10,7 @@ import java.util.List; import java.util.Stack; import java.util.concurrent.atomic.AtomicBoolean; -import de.pixart.messenger.Config; +import eu.siacs.conversations.Config; /** * Copyright (C) 2012 Bartek Przybylski diff --git a/src/main/java/de/pixart/messenger/utils/CryptoHelper.java b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java similarity index 97% rename from src/main/java/de/pixart/messenger/utils/CryptoHelper.java rename to src/main/java/eu/siacs/conversations/utils/CryptoHelper.java index 6d14ccf930..429853ac0b 100644 --- a/src/main/java/de/pixart/messenger/utils/CryptoHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.os.Bundle; import android.util.Base64; @@ -26,11 +26,11 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.regex.Pattern; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.http.AesGcmURLStreamHandler; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.http.AesGcmURLStreamHandler; import rocks.xmpp.addr.Jid; public final class CryptoHelper { diff --git a/src/main/java/de/pixart/messenger/utils/CursorUtils.java b/src/main/java/eu/siacs/conversations/utils/CursorUtils.java similarity index 95% rename from src/main/java/de/pixart/messenger/utils/CursorUtils.java rename to src/main/java/eu/siacs/conversations/utils/CursorUtils.java index 69ae83924c..bbcc9533de 100644 --- a/src/main/java/de/pixart/messenger/utils/CursorUtils.java +++ b/src/main/java/eu/siacs/conversations/utils/CursorUtils.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.database.AbstractWindowedCursor; import android.database.Cursor; diff --git a/src/main/java/de/pixart/messenger/utils/EmojiWrapper.java b/src/main/java/eu/siacs/conversations/utils/EmojiWrapper.java similarity index 98% rename from src/main/java/de/pixart/messenger/utils/EmojiWrapper.java rename to src/main/java/eu/siacs/conversations/utils/EmojiWrapper.java index e6725e744a..89e5237986 100644 --- a/src/main/java/de/pixart/messenger/utils/EmojiWrapper.java +++ b/src/main/java/eu/siacs/conversations/utils/EmojiWrapper.java @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import androidx.emoji.text.EmojiCompat; diff --git a/src/main/java/de/pixart/messenger/utils/Emoticons.java b/src/main/java/eu/siacs/conversations/utils/Emoticons.java similarity index 99% rename from src/main/java/de/pixart/messenger/utils/Emoticons.java rename to src/main/java/eu/siacs/conversations/utils/Emoticons.java index 08ee9db99b..64f8acf72c 100644 --- a/src/main/java/de/pixart/messenger/utils/Emoticons.java +++ b/src/main/java/eu/siacs/conversations/utils/Emoticons.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.util.LruCache; diff --git a/src/main/java/de/pixart/messenger/utils/EncryptDecryptFile.java b/src/main/java/eu/siacs/conversations/utils/EncryptDecryptFile.java similarity index 97% rename from src/main/java/de/pixart/messenger/utils/EncryptDecryptFile.java rename to src/main/java/eu/siacs/conversations/utils/EncryptDecryptFile.java index 0441e5751e..af116a8638 100644 --- a/src/main/java/de/pixart/messenger/utils/EncryptDecryptFile.java +++ b/src/main/java/eu/siacs/conversations/utils/EncryptDecryptFile.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.util.Log; @@ -16,7 +16,7 @@ import javax.crypto.CipherOutputStream; import javax.crypto.NoSuchPaddingException; import javax.crypto.spec.SecretKeySpec; -import de.pixart.messenger.Config; +import eu.siacs.conversations.Config; public class EncryptDecryptFile { private static String cipher_mode = "AES/CBC/PKCS5Padding"; diff --git a/src/main/java/de/pixart/messenger/utils/ExceptionHandler.java b/src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java similarity index 96% rename from src/main/java/de/pixart/messenger/utils/ExceptionHandler.java rename to src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java index ec38ea7546..58d74ef084 100644 --- a/src/main/java/de/pixart/messenger/utils/ExceptionHandler.java +++ b/src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.content.Context; diff --git a/src/main/java/de/pixart/messenger/utils/ExceptionHelper.java b/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java similarity index 93% rename from src/main/java/de/pixart/messenger/utils/ExceptionHelper.java rename to src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java index 2f7370ee12..575e30e51c 100644 --- a/src/main/java/de/pixart/messenger/utils/ExceptionHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.content.Context; import android.content.SharedPreferences; @@ -20,13 +20,13 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.ui.XmppActivity; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.ui.XmppActivity; public class ExceptionHelper { private static final String FILENAME = "stacktrace.txt"; diff --git a/src/main/java/de/pixart/messenger/utils/ExifHelper.java b/src/main/java/eu/siacs/conversations/utils/ExifHelper.java similarity index 99% rename from src/main/java/de/pixart/messenger/utils/ExifHelper.java rename to src/main/java/eu/siacs/conversations/utils/ExifHelper.java index 230af54d1f..4124964ead 100644 --- a/src/main/java/de/pixart/messenger/utils/ExifHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/ExifHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.util.Log; diff --git a/src/main/java/de/pixart/messenger/utils/FileUtils.java b/src/main/java/eu/siacs/conversations/utils/FileUtils.java similarity index 98% rename from src/main/java/de/pixart/messenger/utils/FileUtils.java rename to src/main/java/eu/siacs/conversations/utils/FileUtils.java index ce5bcc53bd..b42054263b 100644 --- a/src/main/java/de/pixart/messenger/utils/FileUtils.java +++ b/src/main/java/eu/siacs/conversations/utils/FileUtils.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.annotation.SuppressLint; import android.content.ContentResolver; @@ -16,8 +16,8 @@ import android.webkit.MimeTypeMap; import java.io.File; import java.util.List; -import de.pixart.messenger.Config; -import de.pixart.messenger.persistance.FileBackend; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.persistance.FileBackend; public class FileUtils { diff --git a/src/main/java/de/pixart/messenger/utils/FileWriterException.java b/src/main/java/eu/siacs/conversations/utils/FileWriterException.java similarity index 59% rename from src/main/java/de/pixart/messenger/utils/FileWriterException.java rename to src/main/java/eu/siacs/conversations/utils/FileWriterException.java index 204cffbbd7..f406f4197e 100644 --- a/src/main/java/de/pixart/messenger/utils/FileWriterException.java +++ b/src/main/java/eu/siacs/conversations/utils/FileWriterException.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; public class FileWriterException extends Exception { } diff --git a/src/main/java/de/pixart/messenger/utils/FirstStartManager.java b/src/main/java/eu/siacs/conversations/utils/FirstStartManager.java similarity index 95% rename from src/main/java/de/pixart/messenger/utils/FirstStartManager.java rename to src/main/java/eu/siacs/conversations/utils/FirstStartManager.java index 90e6cf0c65..d29cd36945 100644 --- a/src/main/java/de/pixart/messenger/utils/FirstStartManager.java +++ b/src/main/java/eu/siacs/conversations/utils/FirstStartManager.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.content.Context; import android.content.SharedPreferences; diff --git a/src/main/java/de/pixart/messenger/utils/FtsUtils.java b/src/main/java/eu/siacs/conversations/utils/FtsUtils.java similarity index 99% rename from src/main/java/de/pixart/messenger/utils/FtsUtils.java rename to src/main/java/eu/siacs/conversations/utils/FtsUtils.java index 8ba23fbae2..ca76ecffc0 100644 --- a/src/main/java/de/pixart/messenger/utils/FtsUtils.java +++ b/src/main/java/eu/siacs/conversations/utils/FtsUtils.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/de/pixart/messenger/utils/GeoHelper.java b/src/main/java/eu/siacs/conversations/utils/GeoHelper.java similarity index 94% rename from src/main/java/de/pixart/messenger/utils/GeoHelper.java rename to src/main/java/eu/siacs/conversations/utils/GeoHelper.java index d1456e81d5..9409fd86ac 100644 --- a/src/main/java/de/pixart/messenger/utils/GeoHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/GeoHelper.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.content.Context; import android.content.Intent; @@ -12,12 +12,12 @@ import java.util.ArrayList; import java.util.regex.Matcher; import java.util.regex.Pattern; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.Conversational; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.ui.ShowLocationActivity; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversational; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.ui.ShowLocationActivity; public class GeoHelper { diff --git a/src/main/java/de/pixart/messenger/utils/IP.java b/src/main/java/eu/siacs/conversations/utils/IP.java similarity index 97% rename from src/main/java/de/pixart/messenger/utils/IP.java rename to src/main/java/eu/siacs/conversations/utils/IP.java index 42f9ec5533..5d72cfea2e 100644 --- a/src/main/java/de/pixart/messenger/utils/IP.java +++ b/src/main/java/eu/siacs/conversations/utils/IP.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import java.util.regex.Pattern; diff --git a/src/main/java/de/pixart/messenger/utils/ImStyleParser.java b/src/main/java/eu/siacs/conversations/utils/ImStyleParser.java similarity index 99% rename from src/main/java/de/pixart/messenger/utils/ImStyleParser.java rename to src/main/java/eu/siacs/conversations/utils/ImStyleParser.java index 118f3179f5..8be18e62a1 100644 --- a/src/main/java/de/pixart/messenger/utils/ImStyleParser.java +++ b/src/main/java/eu/siacs/conversations/utils/ImStyleParser.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/de/pixart/messenger/utils/IrregularUnicodeDetector.java b/src/main/java/eu/siacs/conversations/utils/IrregularUnicodeDetector.java similarity index 98% rename from src/main/java/de/pixart/messenger/utils/IrregularUnicodeDetector.java rename to src/main/java/eu/siacs/conversations/utils/IrregularUnicodeDetector.java index 0a81d25a4e..312303503b 100644 --- a/src/main/java/de/pixart/messenger/utils/IrregularUnicodeDetector.java +++ b/src/main/java/eu/siacs/conversations/utils/IrregularUnicodeDetector.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.annotation.TargetApi; import android.content.Context; @@ -52,8 +52,8 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import de.pixart.messenger.R; -import de.pixart.messenger.ui.util.StyledAttributes; +import eu.siacs.conversations.R; +import eu.siacs.conversations.ui.util.StyledAttributes; import rocks.xmpp.addr.Jid; public class IrregularUnicodeDetector { diff --git a/src/main/java/de/pixart/messenger/utils/JidHelper.java b/src/main/java/eu/siacs/conversations/utils/JidHelper.java similarity index 96% rename from src/main/java/de/pixart/messenger/utils/JidHelper.java rename to src/main/java/eu/siacs/conversations/utils/JidHelper.java index 830dd817c7..d362fa5eb1 100644 --- a/src/main/java/de/pixart/messenger/utils/JidHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/JidHelper.java @@ -27,14 +27,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import java.util.Arrays; import java.util.List; import java.util.Locale; -import de.pixart.messenger.xmpp.InvalidJid; +import eu.siacs.conversations.xmpp.InvalidJid; import rocks.xmpp.addr.Jid; public class JidHelper { diff --git a/src/main/java/de/pixart/messenger/utils/LanguageUtils.java b/src/main/java/eu/siacs/conversations/utils/LanguageUtils.java similarity index 94% rename from src/main/java/de/pixart/messenger/utils/LanguageUtils.java rename to src/main/java/eu/siacs/conversations/utils/LanguageUtils.java index f0229e785c..f536e9b7e9 100644 --- a/src/main/java/de/pixart/messenger/utils/LanguageUtils.java +++ b/src/main/java/eu/siacs/conversations/utils/LanguageUtils.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import com.google.common.collect.ImmutableMap; diff --git a/src/main/java/de/pixart/messenger/utils/LocationHelper.java b/src/main/java/eu/siacs/conversations/utils/LocationHelper.java similarity index 96% rename from src/main/java/de/pixart/messenger/utils/LocationHelper.java rename to src/main/java/eu/siacs/conversations/utils/LocationHelper.java index 85226bcd1d..7cce7910cb 100644 --- a/src/main/java/de/pixart/messenger/utils/LocationHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/LocationHelper.java @@ -1,8 +1,8 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.location.Location; -import de.pixart.messenger.Config; +import eu.siacs.conversations.Config; public final class LocationHelper { private static boolean isSameProvider(final String provider1, final String provider2) { diff --git a/src/main/java/de/pixart/messenger/utils/MenuDoubleTabUtil.java b/src/main/java/eu/siacs/conversations/utils/MenuDoubleTabUtil.java similarity index 96% rename from src/main/java/de/pixart/messenger/utils/MenuDoubleTabUtil.java rename to src/main/java/eu/siacs/conversations/utils/MenuDoubleTabUtil.java index 0fdb071b01..284573d35c 100644 --- a/src/main/java/de/pixart/messenger/utils/MenuDoubleTabUtil.java +++ b/src/main/java/eu/siacs/conversations/utils/MenuDoubleTabUtil.java @@ -27,12 +27,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.os.SystemClock; import android.util.Log; -import de.pixart.messenger.Config; +import eu.siacs.conversations.Config; public class MenuDoubleTabUtil { diff --git a/src/main/java/de/pixart/messenger/utils/MessageUtils.java b/src/main/java/eu/siacs/conversations/utils/MessageUtils.java similarity index 95% rename from src/main/java/de/pixart/messenger/utils/MessageUtils.java rename to src/main/java/eu/siacs/conversations/utils/MessageUtils.java index 72e47578eb..667e1961c8 100644 --- a/src/main/java/de/pixart/messenger/utils/MessageUtils.java +++ b/src/main/java/eu/siacs/conversations/utils/MessageUtils.java @@ -27,15 +27,15 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import java.net.MalformedURLException; import java.net.URL; import java.util.regex.Pattern; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.http.AesGcmURLStreamHandler; -import de.pixart.messenger.http.P1S3UrlStreamHandler; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.http.AesGcmURLStreamHandler; +import eu.siacs.conversations.http.P1S3UrlStreamHandler; public class MessageUtils { diff --git a/src/main/java/de/pixart/messenger/utils/MetaData.java b/src/main/java/eu/siacs/conversations/utils/MetaData.java similarity index 97% rename from src/main/java/de/pixart/messenger/utils/MetaData.java rename to src/main/java/eu/siacs/conversations/utils/MetaData.java index 7d6940f4aa..83841e40c1 100644 --- a/src/main/java/de/pixart/messenger/utils/MetaData.java +++ b/src/main/java/eu/siacs/conversations/utils/MetaData.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; /** * Created by ponna on 16-01-2018. diff --git a/src/main/java/de/pixart/messenger/utils/MimeUtils.java b/src/main/java/eu/siacs/conversations/utils/MimeUtils.java similarity index 99% rename from src/main/java/de/pixart/messenger/utils/MimeUtils.java rename to src/main/java/eu/siacs/conversations/utils/MimeUtils.java index 31159e27a7..54145915f9 100644 --- a/src/main/java/de/pixart/messenger/utils/MimeUtils.java +++ b/src/main/java/eu/siacs/conversations/utils/MimeUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.content.Context; import android.net.Uri; @@ -28,9 +28,9 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; -import de.pixart.messenger.Config; -import de.pixart.messenger.entities.Transferable; -import de.pixart.messenger.services.ExportBackupService; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.entities.Transferable; +import eu.siacs.conversations.services.ExportBackupService; /** * Utilities for dealing with MIME types. diff --git a/src/main/java/de/pixart/messenger/utils/Namespace.java b/src/main/java/eu/siacs/conversations/utils/Namespace.java similarity index 98% rename from src/main/java/de/pixart/messenger/utils/Namespace.java rename to src/main/java/eu/siacs/conversations/utils/Namespace.java index 1fbe82a81d..867e55595e 100644 --- a/src/main/java/de/pixart/messenger/utils/Namespace.java +++ b/src/main/java/eu/siacs/conversations/utils/Namespace.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; public final class Namespace { public static final String BLOCKING = "urn:xmpp:blocking"; diff --git a/src/main/java/de/pixart/messenger/utils/NickValidityChecker.java b/src/main/java/eu/siacs/conversations/utils/NickValidityChecker.java similarity index 91% rename from src/main/java/de/pixart/messenger/utils/NickValidityChecker.java rename to src/main/java/eu/siacs/conversations/utils/NickValidityChecker.java index 18219c93ed..6c734e6743 100644 --- a/src/main/java/de/pixart/messenger/utils/NickValidityChecker.java +++ b/src/main/java/eu/siacs/conversations/utils/NickValidityChecker.java @@ -1,10 +1,10 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import java.util.HashSet; import java.util.List; import java.util.Set; -import de.pixart.messenger.entities.Conversation; +import eu.siacs.conversations.entities.Conversation; import rocks.xmpp.addr.Jid; public class NickValidityChecker { diff --git a/src/main/java/de/pixart/messenger/utils/OnPhoneContactsLoadedListener.java b/src/main/java/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java similarity index 81% rename from src/main/java/de/pixart/messenger/utils/OnPhoneContactsLoadedListener.java rename to src/main/java/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java index f19258dda1..9444c1db90 100644 --- a/src/main/java/de/pixart/messenger/utils/OnPhoneContactsLoadedListener.java +++ b/src/main/java/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.os.Bundle; diff --git a/src/main/java/de/pixart/messenger/utils/PRNGFixes.java b/src/main/java/eu/siacs/conversations/utils/PRNGFixes.java similarity index 99% rename from src/main/java/de/pixart/messenger/utils/PRNGFixes.java rename to src/main/java/eu/siacs/conversations/utils/PRNGFixes.java index c26fe9f135..d58dbc1e96 100644 --- a/src/main/java/de/pixart/messenger/utils/PRNGFixes.java +++ b/src/main/java/eu/siacs/conversations/utils/PRNGFixes.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.os.Build; import android.os.Process; diff --git a/src/main/java/de/pixart/messenger/utils/Patterns.java b/src/main/java/eu/siacs/conversations/utils/Patterns.java similarity index 99% rename from src/main/java/de/pixart/messenger/utils/Patterns.java rename to src/main/java/eu/siacs/conversations/utils/Patterns.java index ad6493db20..e146c59423 100644 --- a/src/main/java/de/pixart/messenger/utils/Patterns.java +++ b/src/main/java/eu/siacs/conversations/utils/Patterns.java @@ -19,7 +19,7 @@ * * */ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/main/java/de/pixart/messenger/utils/PermissionUtils.java b/src/main/java/eu/siacs/conversations/utils/PermissionUtils.java similarity index 97% rename from src/main/java/de/pixart/messenger/utils/PermissionUtils.java rename to src/main/java/eu/siacs/conversations/utils/PermissionUtils.java index 57a830080d..1cac4e0962 100644 --- a/src/main/java/de/pixart/messenger/utils/PermissionUtils.java +++ b/src/main/java/eu/siacs/conversations/utils/PermissionUtils.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.Manifest; import android.content.pm.PackageManager; diff --git a/src/main/java/de/pixart/messenger/utils/PhoneHelper.java b/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java similarity index 98% rename from src/main/java/de/pixart/messenger/utils/PhoneHelper.java rename to src/main/java/eu/siacs/conversations/utils/PhoneHelper.java index a9468cfbe3..879b3b83a8 100644 --- a/src/main/java/de/pixart/messenger/utils/PhoneHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.Manifest; import android.annotation.SuppressLint; diff --git a/src/main/java/de/pixart/messenger/utils/QuickLoader.java b/src/main/java/eu/siacs/conversations/utils/QuickLoader.java similarity index 96% rename from src/main/java/de/pixart/messenger/utils/QuickLoader.java rename to src/main/java/eu/siacs/conversations/utils/QuickLoader.java index f7d1964c2d..2bb7b80b4f 100644 --- a/src/main/java/de/pixart/messenger/utils/QuickLoader.java +++ b/src/main/java/eu/siacs/conversations/utils/QuickLoader.java @@ -26,11 +26,11 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import java.util.List; -import de.pixart.messenger.entities.Conversation; +import eu.siacs.conversations.entities.Conversation; public class QuickLoader { diff --git a/src/main/java/de/pixart/messenger/utils/ReplacingSerialSingleThreadExecutor.java b/src/main/java/eu/siacs/conversations/utils/ReplacingSerialSingleThreadExecutor.java similarity index 93% rename from src/main/java/de/pixart/messenger/utils/ReplacingSerialSingleThreadExecutor.java rename to src/main/java/eu/siacs/conversations/utils/ReplacingSerialSingleThreadExecutor.java index 79e5126b2b..1f131e1f2a 100644 --- a/src/main/java/de/pixart/messenger/utils/ReplacingSerialSingleThreadExecutor.java +++ b/src/main/java/eu/siacs/conversations/utils/ReplacingSerialSingleThreadExecutor.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; public class ReplacingSerialSingleThreadExecutor extends SerialSingleThreadExecutor { diff --git a/src/main/java/de/pixart/messenger/utils/ReplacingTaskManager.java b/src/main/java/eu/siacs/conversations/utils/ReplacingTaskManager.java similarity index 96% rename from src/main/java/de/pixart/messenger/utils/ReplacingTaskManager.java rename to src/main/java/eu/siacs/conversations/utils/ReplacingTaskManager.java index c25c6fce4a..aeee8dd967 100644 --- a/src/main/java/de/pixart/messenger/utils/ReplacingTaskManager.java +++ b/src/main/java/eu/siacs/conversations/utils/ReplacingTaskManager.java @@ -26,11 +26,11 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import java.util.HashMap; -import de.pixart.messenger.entities.Account; +import eu.siacs.conversations.entities.Account; public class ReplacingTaskManager { diff --git a/src/main/java/de/pixart/messenger/utils/Resolver.java b/src/main/java/eu/siacs/conversations/utils/Resolver.java similarity index 99% rename from src/main/java/de/pixart/messenger/utils/Resolver.java rename to src/main/java/eu/siacs/conversations/utils/Resolver.java index 1f7eb4ee74..44ebaaedfc 100644 --- a/src/main/java/de/pixart/messenger/utils/Resolver.java +++ b/src/main/java/eu/siacs/conversations/utils/Resolver.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.content.ContentValues; import android.database.Cursor; @@ -40,10 +40,10 @@ import de.measite.minidns.record.CNAME; import de.measite.minidns.record.Data; import de.measite.minidns.record.InternetAddressRR; import de.measite.minidns.record.SRV; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.persistance.FileBackend; -import de.pixart.messenger.services.XmppConnectionService; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.services.XmppConnectionService; public class Resolver { diff --git a/src/main/java/de/pixart/messenger/utils/RichPreview.java b/src/main/java/eu/siacs/conversations/utils/RichPreview.java similarity index 98% rename from src/main/java/de/pixart/messenger/utils/RichPreview.java rename to src/main/java/eu/siacs/conversations/utils/RichPreview.java index 7325f9af46..29f37fd84d 100644 --- a/src/main/java/de/pixart/messenger/utils/RichPreview.java +++ b/src/main/java/eu/siacs/conversations/utils/RichPreview.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.content.Context; import android.os.AsyncTask; @@ -23,8 +23,8 @@ import java.net.URISyntaxException; import java.net.URLEncoder; import java.util.regex.Pattern; -import de.pixart.messenger.Config; -import de.pixart.messenger.services.XmppConnectionService; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.services.XmppConnectionService; /** * Created by ponna on 16-01-2018. diff --git a/src/main/java/de/pixart/messenger/utils/SSLSocketHelper.java b/src/main/java/eu/siacs/conversations/utils/SSLSocketHelper.java similarity index 97% rename from src/main/java/de/pixart/messenger/utils/SSLSocketHelper.java rename to src/main/java/eu/siacs/conversations/utils/SSLSocketHelper.java index 50ece68e75..b09fa7e0b1 100644 --- a/src/main/java/de/pixart/messenger/utils/SSLSocketHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/SSLSocketHelper.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.os.Build; import android.util.Log; @@ -20,8 +20,8 @@ import javax.net.ssl.SSLParameters; import javax.net.ssl.SSLSession; import javax.net.ssl.SSLSocket; -import de.pixart.messenger.Config; -import de.pixart.messenger.entities.Account; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.entities.Account; public class SSLSocketHelper { diff --git a/src/main/java/de/pixart/messenger/utils/SerialSingleThreadExecutor.java b/src/main/java/eu/siacs/conversations/utils/SerialSingleThreadExecutor.java similarity index 95% rename from src/main/java/de/pixart/messenger/utils/SerialSingleThreadExecutor.java rename to src/main/java/eu/siacs/conversations/utils/SerialSingleThreadExecutor.java index a0617b392d..f9728c28f4 100644 --- a/src/main/java/de/pixart/messenger/utils/SerialSingleThreadExecutor.java +++ b/src/main/java/eu/siacs/conversations/utils/SerialSingleThreadExecutor.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.util.Log; @@ -6,7 +6,7 @@ import java.util.ArrayDeque; import java.util.concurrent.Executor; import java.util.concurrent.Executors; -import de.pixart.messenger.Config; +import eu.siacs.conversations.Config; public class SerialSingleThreadExecutor implements Executor { diff --git a/src/main/java/de/pixart/messenger/utils/SignupUtils.java b/src/main/java/eu/siacs/conversations/utils/SignupUtils.java similarity index 81% rename from src/main/java/de/pixart/messenger/utils/SignupUtils.java rename to src/main/java/eu/siacs/conversations/utils/SignupUtils.java index 52534b89d5..d0418ab3d7 100644 --- a/src/main/java/de/pixart/messenger/utils/SignupUtils.java +++ b/src/main/java/eu/siacs/conversations/utils/SignupUtils.java @@ -1,17 +1,17 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.app.Activity; import android.content.Intent; -import de.pixart.messenger.Config; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.ui.ConversationsActivity; -import de.pixart.messenger.ui.EditAccountActivity; -import de.pixart.messenger.ui.MagicCreateActivity; -import de.pixart.messenger.ui.ManageAccountActivity; -import de.pixart.messenger.ui.StartConversationActivity; -import de.pixart.messenger.ui.WelcomeActivity; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.ui.ConversationsActivity; +import eu.siacs.conversations.ui.EditAccountActivity; +import eu.siacs.conversations.ui.MagicCreateActivity; +import eu.siacs.conversations.ui.ManageAccountActivity; +import eu.siacs.conversations.ui.StartConversationActivity; +import eu.siacs.conversations.ui.WelcomeActivity; import rocks.xmpp.addr.Jid; public class SignupUtils { diff --git a/src/main/java/de/pixart/messenger/utils/SocksSocketFactory.java b/src/main/java/eu/siacs/conversations/utils/SocksSocketFactory.java similarity index 97% rename from src/main/java/de/pixart/messenger/utils/SocksSocketFactory.java rename to src/main/java/eu/siacs/conversations/utils/SocksSocketFactory.java index 2e060594b5..53a653d5f9 100644 --- a/src/main/java/de/pixart/messenger/utils/SocksSocketFactory.java +++ b/src/main/java/eu/siacs/conversations/utils/SocksSocketFactory.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import java.io.IOException; import java.io.InputStream; @@ -8,7 +8,7 @@ import java.net.InetSocketAddress; import java.net.Socket; import java.nio.ByteBuffer; -import de.pixart.messenger.Config; +import eu.siacs.conversations.Config; public class SocksSocketFactory { diff --git a/src/main/java/de/pixart/messenger/utils/StringUtils.java b/src/main/java/eu/siacs/conversations/utils/StringUtils.java similarity index 98% rename from src/main/java/de/pixart/messenger/utils/StringUtils.java rename to src/main/java/eu/siacs/conversations/utils/StringUtils.java index 8d0988a0d2..1135560bbe 100644 --- a/src/main/java/de/pixart/messenger/utils/StringUtils.java +++ b/src/main/java/eu/siacs/conversations/utils/StringUtils.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; public class StringUtils { diff --git a/src/main/java/de/pixart/messenger/utils/StylingHelper.java b/src/main/java/eu/siacs/conversations/utils/StylingHelper.java similarity index 98% rename from src/main/java/de/pixart/messenger/utils/StylingHelper.java rename to src/main/java/eu/siacs/conversations/utils/StylingHelper.java index f3dafc81e2..6ed1361505 100644 --- a/src/main/java/de/pixart/messenger/utils/StylingHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/StylingHelper.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.content.Context; import android.graphics.Color; @@ -53,9 +53,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.ui.text.QuoteSpan; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.ui.text.QuoteSpan; public class StylingHelper { diff --git a/src/main/java/de/pixart/messenger/utils/TLSSocketFactory.java b/src/main/java/eu/siacs/conversations/utils/TLSSocketFactory.java similarity index 98% rename from src/main/java/de/pixart/messenger/utils/TLSSocketFactory.java rename to src/main/java/eu/siacs/conversations/utils/TLSSocketFactory.java index 6daa9ac9bf..ede2feb7fa 100644 --- a/src/main/java/de/pixart/messenger/utils/TLSSocketFactory.java +++ b/src/main/java/eu/siacs/conversations/utils/TLSSocketFactory.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import java.io.IOException; import java.net.InetAddress; diff --git a/src/main/java/de/pixart/messenger/utils/ThemeHelper.java b/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java similarity index 98% rename from src/main/java/de/pixart/messenger/utils/ThemeHelper.java rename to src/main/java/eu/siacs/conversations/utils/ThemeHelper.java index 4d1334321b..5eedc325c4 100644 --- a/src/main/java/de/pixart/messenger/utils/ThemeHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/ThemeHelper.java @@ -27,7 +27,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.content.Context; import android.content.SharedPreferences; @@ -43,8 +43,8 @@ import androidx.core.content.ContextCompat; import com.google.android.material.snackbar.Snackbar; -import de.pixart.messenger.R; -import de.pixart.messenger.ui.SettingsActivity; +import eu.siacs.conversations.R; +import eu.siacs.conversations.ui.SettingsActivity; public class ThemeHelper { diff --git a/src/main/java/de/pixart/messenger/utils/TimeframeUtils.java b/src/main/java/eu/siacs/conversations/utils/TimeframeUtils.java similarity index 97% rename from src/main/java/de/pixart/messenger/utils/TimeframeUtils.java rename to src/main/java/eu/siacs/conversations/utils/TimeframeUtils.java index 4085bb51f3..dd0c2ff660 100644 --- a/src/main/java/de/pixart/messenger/utils/TimeframeUtils.java +++ b/src/main/java/eu/siacs/conversations/utils/TimeframeUtils.java @@ -26,13 +26,13 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.content.Context; import androidx.annotation.PluralsRes; -import de.pixart.messenger.R; +import eu.siacs.conversations.R; public class TimeframeUtils { diff --git a/src/main/java/de/pixart/messenger/utils/TorServiceUtils.java b/src/main/java/eu/siacs/conversations/utils/TorServiceUtils.java similarity index 95% rename from src/main/java/de/pixart/messenger/utils/TorServiceUtils.java rename to src/main/java/eu/siacs/conversations/utils/TorServiceUtils.java index 6b4b93c78a..493fdd3336 100644 --- a/src/main/java/de/pixart/messenger/utils/TorServiceUtils.java +++ b/src/main/java/eu/siacs/conversations/utils/TorServiceUtils.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.app.Activity; import android.content.ActivityNotFoundException; @@ -7,7 +7,7 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.net.Uri; -import de.pixart.messenger.R; +import eu.siacs.conversations.R; import me.drakeet.support.toast.ToastCompat; public class TorServiceUtils { diff --git a/src/main/java/de/pixart/messenger/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java similarity index 96% rename from src/main/java/de/pixart/messenger/utils/UIHelper.java rename to src/main/java/eu/siacs/conversations/utils/UIHelper.java index 7a40ba6d60..d4378212ef 100644 --- a/src/main/java/de/pixart/messenger/utils/UIHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.content.Context; import android.graphics.Typeface; @@ -21,24 +21,24 @@ import java.util.Date; import java.util.List; import java.util.Locale; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.crypto.axolotl.AxolotlService; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Contact; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.Conversational; -import de.pixart.messenger.entities.ListItem; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.entities.MucOptions; -import de.pixart.messenger.entities.Presence; -import de.pixart.messenger.entities.Transferable; -import de.pixart.messenger.services.ExportBackupService; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.ui.util.MyLinkify; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.crypto.axolotl.AxolotlService; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Conversational; +import eu.siacs.conversations.entities.ListItem; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.entities.MucOptions; +import eu.siacs.conversations.entities.Presence; +import eu.siacs.conversations.entities.Transferable; +import eu.siacs.conversations.services.ExportBackupService; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.ui.util.MyLinkify; import rocks.xmpp.addr.Jid; -import static de.pixart.messenger.entities.Message.DELETED_MESSAGE_BODY; +import static eu.siacs.conversations.entities.Message.DELETED_MESSAGE_BODY; public class UIHelper { diff --git a/src/main/java/de/pixart/messenger/utils/WakeLockHelper.java b/src/main/java/eu/siacs/conversations/utils/WakeLockHelper.java similarity index 96% rename from src/main/java/de/pixart/messenger/utils/WakeLockHelper.java rename to src/main/java/eu/siacs/conversations/utils/WakeLockHelper.java index 21243e684c..94a893127a 100644 --- a/src/main/java/de/pixart/messenger/utils/WakeLockHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/WakeLockHelper.java @@ -27,12 +27,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.os.PowerManager; import android.util.Log; -import de.pixart.messenger.Config; +import eu.siacs.conversations.Config; public class WakeLockHelper { diff --git a/src/main/java/de/pixart/messenger/utils/WeakReferenceSet.java b/src/main/java/eu/siacs/conversations/utils/WeakReferenceSet.java similarity index 94% rename from src/main/java/de/pixart/messenger/utils/WeakReferenceSet.java rename to src/main/java/eu/siacs/conversations/utils/WeakReferenceSet.java index b6ccbd5606..89f45648f4 100644 --- a/src/main/java/de/pixart/messenger/utils/WeakReferenceSet.java +++ b/src/main/java/eu/siacs/conversations/utils/WeakReferenceSet.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import java.lang.ref.WeakReference; import java.util.HashSet; diff --git a/src/main/java/de/pixart/messenger/utils/XEP0392Helper.java b/src/main/java/eu/siacs/conversations/utils/XEP0392Helper.java similarity index 95% rename from src/main/java/de/pixart/messenger/utils/XEP0392Helper.java rename to src/main/java/eu/siacs/conversations/utils/XEP0392Helper.java index bbfe508983..d656baa507 100644 --- a/src/main/java/de/pixart/messenger/utils/XEP0392Helper.java +++ b/src/main/java/eu/siacs/conversations/utils/XEP0392Helper.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.graphics.Color; diff --git a/src/main/java/de/pixart/messenger/utils/XmlHelper.java b/src/main/java/eu/siacs/conversations/utils/XmlHelper.java similarity index 91% rename from src/main/java/de/pixart/messenger/utils/XmlHelper.java rename to src/main/java/eu/siacs/conversations/utils/XmlHelper.java index d990661e6d..56342a95e6 100644 --- a/src/main/java/de/pixart/messenger/utils/XmlHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/XmlHelper.java @@ -1,6 +1,6 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; -import de.pixart.messenger.xml.Element; +import eu.siacs.conversations.xml.Element; public class XmlHelper { public static String encodeEntities(String content) { diff --git a/src/main/java/de/pixart/messenger/utils/XmppUri.java b/src/main/java/eu/siacs/conversations/utils/XmppUri.java similarity index 99% rename from src/main/java/de/pixart/messenger/utils/XmppUri.java rename to src/main/java/eu/siacs/conversations/utils/XmppUri.java index a57d042276..cd51fc26cc 100644 --- a/src/main/java/de/pixart/messenger/utils/XmppUri.java +++ b/src/main/java/eu/siacs/conversations/utils/XmppUri.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.net.Uri; diff --git a/src/main/java/de/pixart/messenger/xml/Element.java b/src/main/java/eu/siacs/conversations/xml/Element.java similarity index 96% rename from src/main/java/de/pixart/messenger/xml/Element.java rename to src/main/java/eu/siacs/conversations/xml/Element.java index 053ff02a50..a35be85079 100644 --- a/src/main/java/de/pixart/messenger/xml/Element.java +++ b/src/main/java/eu/siacs/conversations/xml/Element.java @@ -1,12 +1,12 @@ -package de.pixart.messenger.xml; +package eu.siacs.conversations.xml; import java.util.ArrayList; import java.util.Hashtable; import java.util.List; -import de.pixart.messenger.utils.XmlHelper; -import de.pixart.messenger.xmpp.InvalidJid; -import de.pixart.messenger.xmpp.stanzas.MessagePacket; +import eu.siacs.conversations.utils.XmlHelper; +import eu.siacs.conversations.xmpp.InvalidJid; +import eu.siacs.conversations.xmpp.stanzas.MessagePacket; import rocks.xmpp.addr.Jid; public class Element { diff --git a/src/main/java/de/pixart/messenger/xml/LocalizedContent.java b/src/main/java/eu/siacs/conversations/xml/LocalizedContent.java similarity index 98% rename from src/main/java/de/pixart/messenger/xml/LocalizedContent.java rename to src/main/java/eu/siacs/conversations/xml/LocalizedContent.java index c327ded834..e08b509d00 100644 --- a/src/main/java/de/pixart/messenger/xml/LocalizedContent.java +++ b/src/main/java/eu/siacs/conversations/xml/LocalizedContent.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.xml; +package eu.siacs.conversations.xml; import com.google.common.collect.Iterables; diff --git a/src/main/java/de/pixart/messenger/xml/Tag.java b/src/main/java/eu/siacs/conversations/xml/Tag.java similarity index 97% rename from src/main/java/de/pixart/messenger/xml/Tag.java rename to src/main/java/eu/siacs/conversations/xml/Tag.java index 8e6944a403..a5460d5487 100644 --- a/src/main/java/de/pixart/messenger/xml/Tag.java +++ b/src/main/java/eu/siacs/conversations/xml/Tag.java @@ -1,11 +1,11 @@ -package de.pixart.messenger.xml; +package eu.siacs.conversations.xml; import java.util.Hashtable; import java.util.Iterator; import java.util.Map.Entry; import java.util.Set; -import de.pixart.messenger.utils.XmlHelper; +import eu.siacs.conversations.utils.XmlHelper; public class Tag { public static final int NO = -1; diff --git a/src/main/java/de/pixart/messenger/xml/TagWriter.java b/src/main/java/eu/siacs/conversations/xml/TagWriter.java similarity index 96% rename from src/main/java/de/pixart/messenger/xml/TagWriter.java rename to src/main/java/eu/siacs/conversations/xml/TagWriter.java index 53f04128f6..fdc5050948 100644 --- a/src/main/java/de/pixart/messenger/xml/TagWriter.java +++ b/src/main/java/eu/siacs/conversations/xml/TagWriter.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.xml; +package eu.siacs.conversations.xml; import android.util.Log; @@ -9,8 +9,8 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -import de.pixart.messenger.Config; -import de.pixart.messenger.xmpp.stanzas.AbstractStanza; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; public class TagWriter { diff --git a/src/main/java/de/pixart/messenger/xml/XmlElementReader.java b/src/main/java/eu/siacs/conversations/xml/XmlElementReader.java similarity index 93% rename from src/main/java/de/pixart/messenger/xml/XmlElementReader.java rename to src/main/java/eu/siacs/conversations/xml/XmlElementReader.java index 108822509b..f512fd681d 100644 --- a/src/main/java/de/pixart/messenger/xml/XmlElementReader.java +++ b/src/main/java/eu/siacs/conversations/xml/XmlElementReader.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.xml; +package eu.siacs.conversations.xml; import com.google.common.io.ByteSource; diff --git a/src/main/java/de/pixart/messenger/xml/XmlReader.java b/src/main/java/eu/siacs/conversations/xml/XmlReader.java similarity index 98% rename from src/main/java/de/pixart/messenger/xml/XmlReader.java rename to src/main/java/eu/siacs/conversations/xml/XmlReader.java index ef2a331580..151cd6db5f 100644 --- a/src/main/java/de/pixart/messenger/xml/XmlReader.java +++ b/src/main/java/eu/siacs/conversations/xml/XmlReader.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.xml; +package eu.siacs.conversations.xml; import android.util.Log; import android.util.Xml; @@ -11,7 +11,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import de.pixart.messenger.Config; +import eu.siacs.conversations.Config; public class XmlReader implements Closeable { private final XmlPullParser parser; diff --git a/src/main/java/de/pixart/messenger/xmpp/InvalidJid.java b/src/main/java/eu/siacs/conversations/xmpp/InvalidJid.java similarity index 97% rename from src/main/java/de/pixart/messenger/xmpp/InvalidJid.java rename to src/main/java/eu/siacs/conversations/xmpp/InvalidJid.java index 624e6b4633..0f91109530 100644 --- a/src/main/java/de/pixart/messenger/xmpp/InvalidJid.java +++ b/src/main/java/eu/siacs/conversations/xmpp/InvalidJid.java @@ -27,11 +27,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package de.pixart.messenger.xmpp; +package eu.siacs.conversations.xmpp; import androidx.annotation.NonNull; -import de.pixart.messenger.xmpp.stanzas.AbstractStanza; +import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; import rocks.xmpp.addr.Jid; public class InvalidJid implements Jid { diff --git a/src/main/java/de/pixart/messenger/xmpp/OnAdvancedStreamFeaturesLoaded.java b/src/main/java/eu/siacs/conversations/xmpp/OnAdvancedStreamFeaturesLoaded.java similarity index 60% rename from src/main/java/de/pixart/messenger/xmpp/OnAdvancedStreamFeaturesLoaded.java rename to src/main/java/eu/siacs/conversations/xmpp/OnAdvancedStreamFeaturesLoaded.java index 3ca11c068d..d1a0fe1384 100644 --- a/src/main/java/de/pixart/messenger/xmpp/OnAdvancedStreamFeaturesLoaded.java +++ b/src/main/java/eu/siacs/conversations/xmpp/OnAdvancedStreamFeaturesLoaded.java @@ -1,6 +1,6 @@ -package de.pixart.messenger.xmpp; +package eu.siacs.conversations.xmpp; -import de.pixart.messenger.entities.Account; +import eu.siacs.conversations.entities.Account; public interface OnAdvancedStreamFeaturesLoaded { public void onAdvancedStreamFeaturesAvailable(final Account account); diff --git a/src/main/java/eu/siacs/conversations/xmpp/OnBindListener.java b/src/main/java/eu/siacs/conversations/xmpp/OnBindListener.java new file mode 100644 index 0000000000..30ad899191 --- /dev/null +++ b/src/main/java/eu/siacs/conversations/xmpp/OnBindListener.java @@ -0,0 +1,7 @@ +package eu.siacs.conversations.xmpp; + +import eu.siacs.conversations.entities.Account; + +public interface OnBindListener { + public void onBind(Account account); +} diff --git a/src/main/java/de/pixart/messenger/xmpp/OnContactStatusChanged.java b/src/main/java/eu/siacs/conversations/xmpp/OnContactStatusChanged.java similarity index 60% rename from src/main/java/de/pixart/messenger/xmpp/OnContactStatusChanged.java rename to src/main/java/eu/siacs/conversations/xmpp/OnContactStatusChanged.java index 66cd248581..00567328e3 100644 --- a/src/main/java/de/pixart/messenger/xmpp/OnContactStatusChanged.java +++ b/src/main/java/eu/siacs/conversations/xmpp/OnContactStatusChanged.java @@ -1,6 +1,6 @@ -package de.pixart.messenger.xmpp; +package eu.siacs.conversations.xmpp; -import de.pixart.messenger.entities.Contact; +import eu.siacs.conversations.entities.Contact; public interface OnContactStatusChanged { public void onContactStatusChanged(final Contact contact, final boolean online); diff --git a/src/main/java/eu/siacs/conversations/xmpp/OnIqPacketReceived.java b/src/main/java/eu/siacs/conversations/xmpp/OnIqPacketReceived.java new file mode 100644 index 0000000000..6fe75bfe71 --- /dev/null +++ b/src/main/java/eu/siacs/conversations/xmpp/OnIqPacketReceived.java @@ -0,0 +1,8 @@ +package eu.siacs.conversations.xmpp; + +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.xmpp.stanzas.IqPacket; + +public interface OnIqPacketReceived extends PacketReceived { + void onIqPacketReceived(Account account, IqPacket packet); +} diff --git a/src/main/java/de/pixart/messenger/xmpp/OnKeyStatusUpdated.java b/src/main/java/eu/siacs/conversations/xmpp/OnKeyStatusUpdated.java similarity index 53% rename from src/main/java/de/pixart/messenger/xmpp/OnKeyStatusUpdated.java rename to src/main/java/eu/siacs/conversations/xmpp/OnKeyStatusUpdated.java index 925a2544dd..f5d4602b93 100644 --- a/src/main/java/de/pixart/messenger/xmpp/OnKeyStatusUpdated.java +++ b/src/main/java/eu/siacs/conversations/xmpp/OnKeyStatusUpdated.java @@ -1,6 +1,6 @@ -package de.pixart.messenger.xmpp; +package eu.siacs.conversations.xmpp; -import de.pixart.messenger.crypto.axolotl.AxolotlService; +import eu.siacs.conversations.crypto.axolotl.AxolotlService; public interface OnKeyStatusUpdated { public void onKeyStatusUpdated(AxolotlService.FetchStatus report); diff --git a/src/main/java/de/pixart/messenger/xmpp/OnMessageAcknowledged.java b/src/main/java/eu/siacs/conversations/xmpp/OnMessageAcknowledged.java similarity index 55% rename from src/main/java/de/pixart/messenger/xmpp/OnMessageAcknowledged.java rename to src/main/java/eu/siacs/conversations/xmpp/OnMessageAcknowledged.java index 9c123af7cc..22a34ce7f4 100644 --- a/src/main/java/de/pixart/messenger/xmpp/OnMessageAcknowledged.java +++ b/src/main/java/eu/siacs/conversations/xmpp/OnMessageAcknowledged.java @@ -1,6 +1,6 @@ -package de.pixart.messenger.xmpp; +package eu.siacs.conversations.xmpp; -import de.pixart.messenger.entities.Account; +import eu.siacs.conversations.entities.Account; public interface OnMessageAcknowledged { boolean onMessageAcknowledged(Account account, String id); diff --git a/src/main/java/de/pixart/messenger/xmpp/OnMessagePacketReceived.java b/src/main/java/eu/siacs/conversations/xmpp/OnMessagePacketReceived.java similarity index 51% rename from src/main/java/de/pixart/messenger/xmpp/OnMessagePacketReceived.java rename to src/main/java/eu/siacs/conversations/xmpp/OnMessagePacketReceived.java index d4d54f8df1..f1664252f2 100644 --- a/src/main/java/de/pixart/messenger/xmpp/OnMessagePacketReceived.java +++ b/src/main/java/eu/siacs/conversations/xmpp/OnMessagePacketReceived.java @@ -1,7 +1,7 @@ -package de.pixart.messenger.xmpp; +package eu.siacs.conversations.xmpp; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.xmpp.stanzas.MessagePacket; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.xmpp.stanzas.MessagePacket; public interface OnMessagePacketReceived extends PacketReceived { public void onMessagePacketReceived(Account account, MessagePacket packet); diff --git a/src/main/java/de/pixart/messenger/xmpp/OnNewKeysAvailable.java b/src/main/java/eu/siacs/conversations/xmpp/OnNewKeysAvailable.java similarity index 100% rename from src/main/java/de/pixart/messenger/xmpp/OnNewKeysAvailable.java rename to src/main/java/eu/siacs/conversations/xmpp/OnNewKeysAvailable.java diff --git a/src/main/java/de/pixart/messenger/xmpp/OnPresencePacketReceived.java b/src/main/java/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java similarity index 51% rename from src/main/java/de/pixart/messenger/xmpp/OnPresencePacketReceived.java rename to src/main/java/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java index 2df725ff7c..9e5d4b6a48 100644 --- a/src/main/java/de/pixart/messenger/xmpp/OnPresencePacketReceived.java +++ b/src/main/java/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java @@ -1,7 +1,7 @@ -package de.pixart.messenger.xmpp; +package eu.siacs.conversations.xmpp; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.xmpp.stanzas.PresencePacket; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.xmpp.stanzas.PresencePacket; public interface OnPresencePacketReceived extends PacketReceived { public void onPresencePacketReceived(Account account, PresencePacket packet); diff --git a/src/main/java/de/pixart/messenger/xmpp/OnStatusChanged.java b/src/main/java/eu/siacs/conversations/xmpp/OnStatusChanged.java similarity index 51% rename from src/main/java/de/pixart/messenger/xmpp/OnStatusChanged.java rename to src/main/java/eu/siacs/conversations/xmpp/OnStatusChanged.java index 40b7b313a3..55143c7fc6 100644 --- a/src/main/java/de/pixart/messenger/xmpp/OnStatusChanged.java +++ b/src/main/java/eu/siacs/conversations/xmpp/OnStatusChanged.java @@ -1,6 +1,6 @@ -package de.pixart.messenger.xmpp; +package eu.siacs.conversations.xmpp; -import de.pixart.messenger.entities.Account; +import eu.siacs.conversations.entities.Account; public interface OnStatusChanged { public void onStatusChanged(Account account); diff --git a/src/main/java/de/pixart/messenger/xmpp/OnUpdateBlocklist.java b/src/main/java/eu/siacs/conversations/xmpp/OnUpdateBlocklist.java similarity index 91% rename from src/main/java/de/pixart/messenger/xmpp/OnUpdateBlocklist.java rename to src/main/java/eu/siacs/conversations/xmpp/OnUpdateBlocklist.java index 3f66050257..cd9b3afafd 100644 --- a/src/main/java/de/pixart/messenger/xmpp/OnUpdateBlocklist.java +++ b/src/main/java/eu/siacs/conversations/xmpp/OnUpdateBlocklist.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.xmpp; +package eu.siacs.conversations.xmpp; public interface OnUpdateBlocklist { // Use an enum instead of a boolean to make sure we don't run into the boolean trap diff --git a/src/main/java/de/pixart/messenger/xmpp/PacketReceived.java b/src/main/java/eu/siacs/conversations/xmpp/PacketReceived.java similarity index 55% rename from src/main/java/de/pixart/messenger/xmpp/PacketReceived.java rename to src/main/java/eu/siacs/conversations/xmpp/PacketReceived.java index b5b02b1478..d4502d7346 100644 --- a/src/main/java/de/pixart/messenger/xmpp/PacketReceived.java +++ b/src/main/java/eu/siacs/conversations/xmpp/PacketReceived.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.xmpp; +package eu.siacs.conversations.xmpp; public abstract interface PacketReceived { diff --git a/src/main/java/de/pixart/messenger/xmpp/Patches.java b/src/main/java/eu/siacs/conversations/xmpp/Patches.java similarity index 91% rename from src/main/java/de/pixart/messenger/xmpp/Patches.java rename to src/main/java/eu/siacs/conversations/xmpp/Patches.java index 83ca2b9fa2..aa8223a6ba 100644 --- a/src/main/java/de/pixart/messenger/xmpp/Patches.java +++ b/src/main/java/eu/siacs/conversations/xmpp/Patches.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.xmpp; +package eu.siacs.conversations.xmpp; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java similarity index 97% rename from src/main/java/de/pixart/messenger/xmpp/XmppConnection.java rename to src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java index 05b5bc73ea..9b44a155e9 100644 --- a/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.xmpp; +package eu.siacs.conversations.xmpp; import android.content.Context; import android.graphics.Bitmap; @@ -53,54 +53,54 @@ import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.X509KeyManager; import javax.net.ssl.X509TrustManager; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.crypto.DomainHostnameVerifier; -import de.pixart.messenger.crypto.XmppDomainVerifier; -import de.pixart.messenger.crypto.axolotl.AxolotlService; -import de.pixart.messenger.crypto.sasl.Anonymous; -import de.pixart.messenger.crypto.sasl.DigestMd5; -import de.pixart.messenger.crypto.sasl.External; -import de.pixart.messenger.crypto.sasl.Plain; -import de.pixart.messenger.crypto.sasl.SaslMechanism; -import de.pixart.messenger.crypto.sasl.ScramSha1; -import de.pixart.messenger.crypto.sasl.ScramSha256; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.entities.ServiceDiscoveryResult; -import de.pixart.messenger.generator.IqGenerator; -import de.pixart.messenger.persistance.FileBackend; -import de.pixart.messenger.services.MemorizingTrustManager; -import de.pixart.messenger.services.MessageArchiveService; -import de.pixart.messenger.services.NotificationService; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.utils.CryptoHelper; -import de.pixart.messenger.utils.Namespace; -import de.pixart.messenger.utils.Patterns; -import de.pixart.messenger.utils.Resolver; -import de.pixart.messenger.utils.SSLSocketHelper; -import de.pixart.messenger.utils.SocksSocketFactory; -import de.pixart.messenger.utils.XmlHelper; -import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xml.LocalizedContent; -import de.pixart.messenger.xml.Tag; -import de.pixart.messenger.xml.TagWriter; -import de.pixart.messenger.xml.XmlReader; -import de.pixart.messenger.xmpp.forms.Data; -import de.pixart.messenger.xmpp.forms.Field; -import de.pixart.messenger.xmpp.jingle.OnJinglePacketReceived; -import de.pixart.messenger.xmpp.jingle.stanzas.JinglePacket; -import de.pixart.messenger.xmpp.stanzas.AbstractAcknowledgeableStanza; -import de.pixart.messenger.xmpp.stanzas.AbstractStanza; -import de.pixart.messenger.xmpp.stanzas.IqPacket; -import de.pixart.messenger.xmpp.stanzas.MessagePacket; -import de.pixart.messenger.xmpp.stanzas.PresencePacket; -import de.pixart.messenger.xmpp.stanzas.csi.ActivePacket; -import de.pixart.messenger.xmpp.stanzas.csi.InactivePacket; -import de.pixart.messenger.xmpp.stanzas.streammgmt.AckPacket; -import de.pixart.messenger.xmpp.stanzas.streammgmt.EnablePacket; -import de.pixart.messenger.xmpp.stanzas.streammgmt.RequestPacket; -import de.pixart.messenger.xmpp.stanzas.streammgmt.ResumePacket; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.crypto.DomainHostnameVerifier; +import eu.siacs.conversations.crypto.XmppDomainVerifier; +import eu.siacs.conversations.crypto.axolotl.AxolotlService; +import eu.siacs.conversations.crypto.sasl.Anonymous; +import eu.siacs.conversations.crypto.sasl.DigestMd5; +import eu.siacs.conversations.crypto.sasl.External; +import eu.siacs.conversations.crypto.sasl.Plain; +import eu.siacs.conversations.crypto.sasl.SaslMechanism; +import eu.siacs.conversations.crypto.sasl.ScramSha1; +import eu.siacs.conversations.crypto.sasl.ScramSha256; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.entities.ServiceDiscoveryResult; +import eu.siacs.conversations.generator.IqGenerator; +import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.services.MemorizingTrustManager; +import eu.siacs.conversations.services.MessageArchiveService; +import eu.siacs.conversations.services.NotificationService; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.utils.Namespace; +import eu.siacs.conversations.utils.Patterns; +import eu.siacs.conversations.utils.Resolver; +import eu.siacs.conversations.utils.SSLSocketHelper; +import eu.siacs.conversations.utils.SocksSocketFactory; +import eu.siacs.conversations.utils.XmlHelper; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xml.LocalizedContent; +import eu.siacs.conversations.xml.Tag; +import eu.siacs.conversations.xml.TagWriter; +import eu.siacs.conversations.xml.XmlReader; +import eu.siacs.conversations.xmpp.forms.Data; +import eu.siacs.conversations.xmpp.forms.Field; +import eu.siacs.conversations.xmpp.jingle.OnJinglePacketReceived; +import eu.siacs.conversations.xmpp.jingle.stanzas.JinglePacket; +import eu.siacs.conversations.xmpp.stanzas.AbstractAcknowledgeableStanza; +import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; +import eu.siacs.conversations.xmpp.stanzas.IqPacket; +import eu.siacs.conversations.xmpp.stanzas.MessagePacket; +import eu.siacs.conversations.xmpp.stanzas.PresencePacket; +import eu.siacs.conversations.xmpp.stanzas.csi.ActivePacket; +import eu.siacs.conversations.xmpp.stanzas.csi.InactivePacket; +import eu.siacs.conversations.xmpp.stanzas.streammgmt.AckPacket; +import eu.siacs.conversations.xmpp.stanzas.streammgmt.EnablePacket; +import eu.siacs.conversations.xmpp.stanzas.streammgmt.RequestPacket; +import eu.siacs.conversations.xmpp.stanzas.streammgmt.ResumePacket; import rocks.xmpp.addr.Jid; public class XmppConnection implements Runnable { diff --git a/src/main/java/de/pixart/messenger/xmpp/chatstate/ChatState.java b/src/main/java/eu/siacs/conversations/xmpp/chatstate/ChatState.java similarity index 91% rename from src/main/java/de/pixart/messenger/xmpp/chatstate/ChatState.java rename to src/main/java/eu/siacs/conversations/xmpp/chatstate/ChatState.java index 169d0bb667..5063deda5b 100644 --- a/src/main/java/de/pixart/messenger/xmpp/chatstate/ChatState.java +++ b/src/main/java/eu/siacs/conversations/xmpp/chatstate/ChatState.java @@ -1,6 +1,6 @@ -package de.pixart.messenger.xmpp.chatstate; +package eu.siacs.conversations.xmpp.chatstate; -import de.pixart.messenger.xml.Element; +import eu.siacs.conversations.xml.Element; public enum ChatState { diff --git a/src/main/java/de/pixart/messenger/xmpp/forms/Data.java b/src/main/java/eu/siacs/conversations/xmpp/forms/Data.java similarity index 96% rename from src/main/java/de/pixart/messenger/xmpp/forms/Data.java rename to src/main/java/eu/siacs/conversations/xmpp/forms/Data.java index ba70a5d1ae..f991925b32 100644 --- a/src/main/java/de/pixart/messenger/xmpp/forms/Data.java +++ b/src/main/java/eu/siacs/conversations/xmpp/forms/Data.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.xmpp.forms; +package eu.siacs.conversations.xmpp.forms; import android.os.Bundle; @@ -7,8 +7,8 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; -import de.pixart.messenger.utils.Namespace; -import de.pixart.messenger.xml.Element; +import eu.siacs.conversations.utils.Namespace; +import eu.siacs.conversations.xml.Element; public class Data extends Element { diff --git a/src/main/java/de/pixart/messenger/xmpp/forms/Field.java b/src/main/java/eu/siacs/conversations/xmpp/forms/Field.java similarity index 95% rename from src/main/java/de/pixart/messenger/xmpp/forms/Field.java rename to src/main/java/eu/siacs/conversations/xmpp/forms/Field.java index eb844077b9..488bd7f759 100644 --- a/src/main/java/de/pixart/messenger/xmpp/forms/Field.java +++ b/src/main/java/eu/siacs/conversations/xmpp/forms/Field.java @@ -1,11 +1,11 @@ -package de.pixart.messenger.xmpp.forms; +package eu.siacs.conversations.xmpp.forms; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; -import de.pixart.messenger.xml.Element; +import eu.siacs.conversations.xml.Element; public class Field extends Element { diff --git a/src/main/java/de/pixart/messenger/xmpp/jid/OtrJidHelper.java b/src/main/java/eu/siacs/conversations/xmpp/jid/OtrJidHelper.java similarity index 90% rename from src/main/java/de/pixart/messenger/xmpp/jid/OtrJidHelper.java rename to src/main/java/eu/siacs/conversations/xmpp/jid/OtrJidHelper.java index 4710b95325..2eb39bd73c 100644 --- a/src/main/java/de/pixart/messenger/xmpp/jid/OtrJidHelper.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jid/OtrJidHelper.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.xmpp.jid; +package eu.siacs.conversations.xmpp.jid; import net.java.otr4j.session.SessionID; diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/DirectConnectionUtils.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/DirectConnectionUtils.java similarity index 98% rename from src/main/java/de/pixart/messenger/xmpp/jingle/DirectConnectionUtils.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/DirectConnectionUtils.java index ee2e0f0fe0..406406a2df 100644 --- a/src/main/java/de/pixart/messenger/xmpp/jingle/DirectConnectionUtils.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/DirectConnectionUtils.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.xmpp.jingle; +package eu.siacs.conversations.xmpp.jingle; import java.net.Inet6Address; import java.net.InetAddress; diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleCandidate.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java similarity index 96% rename from src/main/java/de/pixart/messenger/xmpp/jingle/JingleCandidate.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java index 063c1a39d4..61c7838697 100644 --- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleCandidate.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java @@ -1,10 +1,10 @@ -package de.pixart.messenger.xmpp.jingle; +package eu.siacs.conversations.xmpp.jingle; import java.util.ArrayList; import java.util.List; -import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xmpp.InvalidJid; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.InvalidJid; import rocks.xmpp.addr.Jid; public class JingleCandidate { diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java similarity index 97% rename from src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java index 7e78121edb..be5c99812e 100644 --- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.xmpp.jingle; +package eu.siacs.conversations.xmpp.jingle; import android.util.Base64; import android.util.Log; @@ -19,29 +19,29 @@ import java.util.Locale; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; -import de.pixart.messenger.Config; -import de.pixart.messenger.crypto.axolotl.AxolotlService; -import de.pixart.messenger.crypto.axolotl.XmppAxolotlMessage; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.entities.DownloadableFile; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.entities.Presence; -import de.pixart.messenger.entities.ServiceDiscoveryResult; -import de.pixart.messenger.entities.Transferable; -import de.pixart.messenger.entities.TransferablePlaceholder; -import de.pixart.messenger.parser.IqParser; -import de.pixart.messenger.persistance.FileBackend; -import de.pixart.messenger.services.AbstractConnectionManager; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.utils.CryptoHelper; -import de.pixart.messenger.utils.Namespace; -import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xmpp.OnIqPacketReceived; -import de.pixart.messenger.xmpp.jingle.stanzas.Content; -import de.pixart.messenger.xmpp.jingle.stanzas.JinglePacket; -import de.pixart.messenger.xmpp.jingle.stanzas.Reason; -import de.pixart.messenger.xmpp.stanzas.IqPacket; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.crypto.axolotl.AxolotlService; +import eu.siacs.conversations.crypto.axolotl.XmppAxolotlMessage; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.DownloadableFile; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.entities.Presence; +import eu.siacs.conversations.entities.ServiceDiscoveryResult; +import eu.siacs.conversations.entities.Transferable; +import eu.siacs.conversations.entities.TransferablePlaceholder; +import eu.siacs.conversations.parser.IqParser; +import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.services.AbstractConnectionManager; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.utils.Namespace; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.OnIqPacketReceived; +import eu.siacs.conversations.xmpp.jingle.stanzas.Content; +import eu.siacs.conversations.xmpp.jingle.stanzas.JinglePacket; +import eu.siacs.conversations.xmpp.jingle.stanzas.Reason; +import eu.siacs.conversations.xmpp.stanzas.IqPacket; import rocks.xmpp.addr.Jid; public class JingleConnection implements Transferable { diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnectionManager.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java similarity index 92% rename from src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnectionManager.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java index fa57fbac71..0914be0b2d 100644 --- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnectionManager.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.xmpp.jingle; +package eu.siacs.conversations.xmpp.jingle; import android.annotation.SuppressLint; import android.util.Log; @@ -9,17 +9,17 @@ import java.util.HashMap; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import de.pixart.messenger.Config; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Message; -import de.pixart.messenger.entities.Transferable; -import de.pixart.messenger.services.AbstractConnectionManager; -import de.pixart.messenger.services.XmppConnectionService; -import de.pixart.messenger.utils.Namespace; -import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xmpp.OnIqPacketReceived; -import de.pixart.messenger.xmpp.jingle.stanzas.JinglePacket; -import de.pixart.messenger.xmpp.stanzas.IqPacket; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.entities.Transferable; +import eu.siacs.conversations.services.AbstractConnectionManager; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.utils.Namespace; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.OnIqPacketReceived; +import eu.siacs.conversations.xmpp.jingle.stanzas.JinglePacket; +import eu.siacs.conversations.xmpp.stanzas.IqPacket; import rocks.xmpp.addr.Jid; public class JingleConnectionManager extends AbstractConnectionManager { diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleInBandTransport.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInBandTransport.java similarity index 95% rename from src/main/java/de/pixart/messenger/xmpp/jingle/JingleInBandTransport.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInBandTransport.java index 5de6664023..07959ee23a 100644 --- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleInBandTransport.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInBandTransport.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.xmpp.jingle; +package eu.siacs.conversations.xmpp.jingle; import android.util.Base64; import android.util.Log; @@ -10,14 +10,14 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import de.pixart.messenger.Config; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.DownloadableFile; -import de.pixart.messenger.persistance.FileBackend; -import de.pixart.messenger.services.AbstractConnectionManager; -import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xmpp.OnIqPacketReceived; -import de.pixart.messenger.xmpp.stanzas.IqPacket; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.DownloadableFile; +import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.services.AbstractConnectionManager; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.OnIqPacketReceived; +import eu.siacs.conversations.xmpp.stanzas.IqPacket; import rocks.xmpp.addr.Jid; public class JingleInBandTransport extends JingleTransport { diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleSocks5Transport.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java similarity index 96% rename from src/main/java/de/pixart/messenger/xmpp/jingle/JingleSocks5Transport.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java index ab605f4f30..8e3c065a23 100644 --- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleSocks5Transport.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.xmpp.jingle; +package eu.siacs.conversations.xmpp.jingle; import android.os.PowerManager; import android.util.Log; @@ -15,15 +15,15 @@ import java.nio.ByteBuffer; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import de.pixart.messenger.Config; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.DownloadableFile; -import de.pixart.messenger.persistance.FileBackend; -import de.pixart.messenger.services.AbstractConnectionManager; -import de.pixart.messenger.utils.CryptoHelper; -import de.pixart.messenger.utils.SocksSocketFactory; -import de.pixart.messenger.utils.WakeLockHelper; -import de.pixart.messenger.xmpp.jingle.stanzas.Content; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.DownloadableFile; +import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.services.AbstractConnectionManager; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.utils.SocksSocketFactory; +import eu.siacs.conversations.utils.WakeLockHelper; +import eu.siacs.conversations.xmpp.jingle.stanzas.Content; public class JingleSocks5Transport extends JingleTransport { private static final int SOCKET_TIMEOUT_DIRECT = 3000; diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleTransport.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleTransport.java similarity index 81% rename from src/main/java/de/pixart/messenger/xmpp/jingle/JingleTransport.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/JingleTransport.java index b9adb46322..9ca20b1964 100644 --- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleTransport.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleTransport.java @@ -1,6 +1,6 @@ -package de.pixart.messenger.xmpp.jingle; +package eu.siacs.conversations.xmpp.jingle; -import de.pixart.messenger.entities.DownloadableFile; +import eu.siacs.conversations.entities.DownloadableFile; public abstract class JingleTransport { public abstract void connect(final OnTransportConnected callback); diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/OnFileTransmissionStatusChanged.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java similarity index 58% rename from src/main/java/de/pixart/messenger/xmpp/jingle/OnFileTransmissionStatusChanged.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java index 65f9726d80..376b82a634 100644 --- a/src/main/java/de/pixart/messenger/xmpp/jingle/OnFileTransmissionStatusChanged.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java @@ -1,6 +1,6 @@ -package de.pixart.messenger.xmpp.jingle; +package eu.siacs.conversations.xmpp.jingle; -import de.pixart.messenger.entities.DownloadableFile; +import eu.siacs.conversations.entities.DownloadableFile; public interface OnFileTransmissionStatusChanged { void onFileTransmitted(DownloadableFile file); diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnJinglePacketReceived.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/OnJinglePacketReceived.java new file mode 100644 index 0000000000..e258458097 --- /dev/null +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/OnJinglePacketReceived.java @@ -0,0 +1,9 @@ +package eu.siacs.conversations.xmpp.jingle; + +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.xmpp.PacketReceived; +import eu.siacs.conversations.xmpp.jingle.stanzas.JinglePacket; + +public interface OnJinglePacketReceived extends PacketReceived { + void onJinglePacketReceived(Account account, JinglePacket packet); +} diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/OnPrimaryCandidateFound.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java similarity index 73% rename from src/main/java/de/pixart/messenger/xmpp/jingle/OnPrimaryCandidateFound.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java index b1fb0b02a0..16c61444c5 100644 --- a/src/main/java/de/pixart/messenger/xmpp/jingle/OnPrimaryCandidateFound.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.xmpp.jingle; +package eu.siacs.conversations.xmpp.jingle; public interface OnPrimaryCandidateFound { void onPrimaryCandidateFound(boolean success, JingleCandidate canditate); diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/OnTransportConnected.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java similarity index 69% rename from src/main/java/de/pixart/messenger/xmpp/jingle/OnTransportConnected.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java index 11a3eed5e7..c0920d1a03 100644 --- a/src/main/java/de/pixart/messenger/xmpp/jingle/OnTransportConnected.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.xmpp.jingle; +package eu.siacs.conversations.xmpp.jingle; public interface OnTransportConnected { public void failed(); diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/Transport.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/Transport.java new file mode 100644 index 0000000000..4d0fb4b652 --- /dev/null +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/Transport.java @@ -0,0 +1,5 @@ +package eu.siacs.conversations.xmpp.jingle; + +public enum Transport { + SOCKS, IBB +} diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Content.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java similarity index 95% rename from src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Content.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java index 121225000a..9905c2b433 100644 --- a/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Content.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java @@ -1,8 +1,8 @@ -package de.pixart.messenger.xmpp.jingle.stanzas; +package eu.siacs.conversations.xmpp.jingle.stanzas; -import de.pixart.messenger.entities.DownloadableFile; -import de.pixart.messenger.utils.Namespace; -import de.pixart.messenger.xml.Element; +import eu.siacs.conversations.entities.DownloadableFile; +import eu.siacs.conversations.utils.Namespace; +import eu.siacs.conversations.xml.Element; public class Content extends Element { diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/JinglePacket.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java similarity index 95% rename from src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/JinglePacket.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java index 8d16a1c6e6..cd91053eed 100644 --- a/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/JinglePacket.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java @@ -1,9 +1,9 @@ -package de.pixart.messenger.xmpp.jingle.stanzas; +package eu.siacs.conversations.xmpp.jingle.stanzas; import android.util.Base64; -import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xmpp.stanzas.IqPacket; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.stanzas.IqPacket; import rocks.xmpp.addr.Jid; public class JinglePacket extends IqPacket { diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Reason.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java similarity index 62% rename from src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Reason.java rename to src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java index 19f27bc40c..a3ac1ee719 100644 --- a/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Reason.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java @@ -1,6 +1,6 @@ -package de.pixart.messenger.xmpp.jingle.stanzas; +package eu.siacs.conversations.xmpp.jingle.stanzas; -import de.pixart.messenger.xml.Element; +import eu.siacs.conversations.xml.Element; public class Reason extends Element { private Reason(String name) { diff --git a/src/main/java/de/pixart/messenger/xmpp/mam/MamReference.java b/src/main/java/eu/siacs/conversations/xmpp/mam/MamReference.java similarity index 97% rename from src/main/java/de/pixart/messenger/xmpp/mam/MamReference.java rename to src/main/java/eu/siacs/conversations/xmpp/mam/MamReference.java index 788e048899..492a43d5ae 100644 --- a/src/main/java/de/pixart/messenger/xmpp/mam/MamReference.java +++ b/src/main/java/eu/siacs/conversations/xmpp/mam/MamReference.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.xmpp.mam; +package eu.siacs.conversations.xmpp.mam; public class MamReference { diff --git a/src/main/java/de/pixart/messenger/xmpp/pep/Avatar.java b/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java similarity index 97% rename from src/main/java/de/pixart/messenger/xmpp/pep/Avatar.java rename to src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java index 2521d09bcb..ec3668a73a 100644 --- a/src/main/java/de/pixart/messenger/xmpp/pep/Avatar.java +++ b/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java @@ -1,8 +1,8 @@ -package de.pixart.messenger.xmpp.pep; +package eu.siacs.conversations.xmpp.pep; import android.util.Base64; -import de.pixart.messenger.xml.Element; +import eu.siacs.conversations.xml.Element; import rocks.xmpp.addr.Jid; public class Avatar { diff --git a/src/main/java/de/pixart/messenger/xmpp/pep/PublishOptions.java b/src/main/java/eu/siacs/conversations/xmpp/pep/PublishOptions.java similarity index 88% rename from src/main/java/de/pixart/messenger/xmpp/pep/PublishOptions.java rename to src/main/java/eu/siacs/conversations/xmpp/pep/PublishOptions.java index f32ea8ab17..8ef87501a0 100644 --- a/src/main/java/de/pixart/messenger/xmpp/pep/PublishOptions.java +++ b/src/main/java/eu/siacs/conversations/xmpp/pep/PublishOptions.java @@ -1,10 +1,10 @@ -package de.pixart.messenger.xmpp.pep; +package eu.siacs.conversations.xmpp.pep; import android.os.Bundle; -import de.pixart.messenger.utils.Namespace; -import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xmpp.stanzas.IqPacket; +import eu.siacs.conversations.utils.Namespace; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.stanzas.IqPacket; public class PublishOptions { diff --git a/src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractAcknowledgeableStanza.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractAcknowledgeableStanza.java similarity index 84% rename from src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractAcknowledgeableStanza.java rename to src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractAcknowledgeableStanza.java index e795b40fd9..711936c5d6 100644 --- a/src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractAcknowledgeableStanza.java +++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractAcknowledgeableStanza.java @@ -1,7 +1,7 @@ -package de.pixart.messenger.xmpp.stanzas; +package eu.siacs.conversations.xmpp.stanzas; -import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xmpp.InvalidJid; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.InvalidJid; abstract public class AbstractAcknowledgeableStanza extends AbstractStanza { diff --git a/src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractStanza.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java similarity index 90% rename from src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractStanza.java rename to src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java index ee0884aa63..8513346e93 100644 --- a/src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractStanza.java +++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java @@ -1,7 +1,7 @@ -package de.pixart.messenger.xmpp.stanzas; +package eu.siacs.conversations.xmpp.stanzas; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.xml.Element; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.xml.Element; import rocks.xmpp.addr.Jid; public class AbstractStanza extends Element { diff --git a/src/main/java/de/pixart/messenger/xmpp/stanzas/IqPacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java similarity index 95% rename from src/main/java/de/pixart/messenger/xmpp/stanzas/IqPacket.java rename to src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java index c74ec32375..6a635c2ab6 100644 --- a/src/main/java/de/pixart/messenger/xmpp/stanzas/IqPacket.java +++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java @@ -1,6 +1,6 @@ -package de.pixart.messenger.xmpp.stanzas; +package eu.siacs.conversations.xmpp.stanzas; -import de.pixart.messenger.xml.Element; +import eu.siacs.conversations.xml.Element; public class IqPacket extends AbstractAcknowledgeableStanza { diff --git a/src/main/java/de/pixart/messenger/xmpp/stanzas/MessagePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java similarity index 93% rename from src/main/java/de/pixart/messenger/xmpp/stanzas/MessagePacket.java rename to src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java index 8b63527c40..17a1b9fbc9 100644 --- a/src/main/java/de/pixart/messenger/xmpp/stanzas/MessagePacket.java +++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java @@ -1,10 +1,10 @@ -package de.pixart.messenger.xmpp.stanzas; +package eu.siacs.conversations.xmpp.stanzas; import android.util.Pair; -import de.pixart.messenger.parser.AbstractParser; -import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xml.LocalizedContent; +import eu.siacs.conversations.parser.AbstractParser; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xml.LocalizedContent; public class MessagePacket extends AbstractAcknowledgeableStanza { public static final int TYPE_CHAT = 0; diff --git a/src/main/java/de/pixart/messenger/xmpp/stanzas/PresencePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java similarity index 75% rename from src/main/java/de/pixart/messenger/xmpp/stanzas/PresencePacket.java rename to src/main/java/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java index 6c57de8071..b09ef4f005 100644 --- a/src/main/java/de/pixart/messenger/xmpp/stanzas/PresencePacket.java +++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.xmpp.stanzas; +package eu.siacs.conversations.xmpp.stanzas; public class PresencePacket extends AbstractAcknowledgeableStanza { diff --git a/src/main/java/de/pixart/messenger/xmpp/stanzas/csi/ActivePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java similarity index 60% rename from src/main/java/de/pixart/messenger/xmpp/stanzas/csi/ActivePacket.java rename to src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java index 5d1cb61c38..aa1c61ad8f 100644 --- a/src/main/java/de/pixart/messenger/xmpp/stanzas/csi/ActivePacket.java +++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java @@ -1,6 +1,6 @@ -package de.pixart.messenger.xmpp.stanzas.csi; +package eu.siacs.conversations.xmpp.stanzas.csi; -import de.pixart.messenger.xmpp.stanzas.AbstractStanza; +import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; public class ActivePacket extends AbstractStanza { public ActivePacket() { diff --git a/src/main/java/de/pixart/messenger/xmpp/stanzas/csi/InactivePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java similarity index 61% rename from src/main/java/de/pixart/messenger/xmpp/stanzas/csi/InactivePacket.java rename to src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java index 9e840190dd..3f6be8d1ba 100644 --- a/src/main/java/de/pixart/messenger/xmpp/stanzas/csi/InactivePacket.java +++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java @@ -1,6 +1,6 @@ -package de.pixart.messenger.xmpp.stanzas.csi; +package eu.siacs.conversations.xmpp.stanzas.csi; -import de.pixart.messenger.xmpp.stanzas.AbstractStanza; +import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; public class InactivePacket extends AbstractStanza { public InactivePacket() { diff --git a/src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/AckPacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java similarity index 69% rename from src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/AckPacket.java rename to src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java index f98707fbe0..97dcf131f4 100644 --- a/src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/AckPacket.java +++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java @@ -1,6 +1,6 @@ -package de.pixart.messenger.xmpp.stanzas.streammgmt; +package eu.siacs.conversations.xmpp.stanzas.streammgmt; -import de.pixart.messenger.xmpp.stanzas.AbstractStanza; +import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; public class AckPacket extends AbstractStanza { diff --git a/src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/EnablePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java similarity index 67% rename from src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/EnablePacket.java rename to src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java index d4c8ab242d..02b6038fdc 100644 --- a/src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/EnablePacket.java +++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java @@ -1,6 +1,6 @@ -package de.pixart.messenger.xmpp.stanzas.streammgmt; +package eu.siacs.conversations.xmpp.stanzas.streammgmt; -import de.pixart.messenger.xmpp.stanzas.AbstractStanza; +import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; public class EnablePacket extends AbstractStanza { diff --git a/src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/RequestPacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java similarity index 62% rename from src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/RequestPacket.java rename to src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java index cbd82eed61..cbc7a1f7d5 100644 --- a/src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/RequestPacket.java +++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java @@ -1,6 +1,6 @@ -package de.pixart.messenger.xmpp.stanzas.streammgmt; +package eu.siacs.conversations.xmpp.stanzas.streammgmt; -import de.pixart.messenger.xmpp.stanzas.AbstractStanza; +import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; public class RequestPacket extends AbstractStanza { diff --git a/src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/ResumePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java similarity index 73% rename from src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/ResumePacket.java rename to src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java index e47fc1b954..44d7e3434c 100644 --- a/src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/ResumePacket.java +++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java @@ -1,6 +1,6 @@ -package de.pixart.messenger.xmpp.stanzas.streammgmt; +package eu.siacs.conversations.xmpp.stanzas.streammgmt; -import de.pixart.messenger.xmpp.stanzas.AbstractStanza; +import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; public class ResumePacket extends AbstractStanza { diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml index db89771a62..b7fe3a25da 100644 --- a/src/main/res/layout/activity_about.xml +++ b/src/main/res/layout/activity_about.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:background="?attr/color_background_tertiary" android:orientation="vertical" - tools:context="de.pixart.messenger.ui.AboutActivity"> + tools:context="eu.siacs.conversations.ui.AboutActivity"> diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml index 033b929eb8..1f558119d6 100644 --- a/src/main/res/layout/activity_change_password.xml +++ b/src/main/res/layout/activity_change_password.xml @@ -41,7 +41,7 @@ app:passwordToggleEnabled="true" app:passwordToggleTint="?android:textColorSecondary"> - - - - - - diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index b8bc8fcb9b..7c622ff717 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -150,7 +150,7 @@ - - - - - - - - + diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index 9748a6b225..7f18c4696a 100644 --- a/src/main/res/layout/fragment_conversation.xml +++ b/src/main/res/layout/fragment_conversation.xml @@ -37,7 +37,7 @@ app:fabSize="mini" app:useCompatPadding="true" /> - - - + - - + \ No newline at end of file diff --git a/src/main/res/layout/message_content.xml b/src/main/res/layout/message_content.xml index 3d64aa1898..401aaedc47 100644 --- a/src/main/res/layout/message_content.xml +++ b/src/main/res/layout/message_content.xml @@ -2,7 +2,7 @@ - - - - + \ No newline at end of file diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 2911727022..3cc3018e8b 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -8,7 +8,7 @@ android:title="@string/pref_ui_options"> - - - diff --git a/src/playstore/AndroidManifest.xml b/src/playstore/AndroidManifest.xml index a54f8bee13..1168962c2d 100644 --- a/src/playstore/AndroidManifest.xml +++ b/src/playstore/AndroidManifest.xml @@ -1,7 +1,7 @@ + package="eu.siacs.conversations"> @@ -17,7 +17,7 @@ android:exported="true" android:permission="android.permission.CHANGE_CONFIGURATION"> - + diff --git a/src/playstore/java/de/pixart/messenger/services/EmojiService.java b/src/playstore/java/eu/siacs/conversations/services/EmojiService.java similarity index 94% rename from src/playstore/java/de/pixart/messenger/services/EmojiService.java rename to src/playstore/java/eu/siacs/conversations/services/EmojiService.java index 0e5bfadd01..daec95252d 100644 --- a/src/playstore/java/de/pixart/messenger/services/EmojiService.java +++ b/src/playstore/java/eu/siacs/conversations/services/EmojiService.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; import android.content.Context; import android.os.Build; @@ -8,8 +8,8 @@ import androidx.core.provider.FontRequest; import androidx.emoji.text.EmojiCompat; import androidx.emoji.text.FontRequestEmojiCompatConfig; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; public class EmojiService { diff --git a/src/playstore/java/de/pixart/messenger/services/MaintenanceReceiver.java b/src/playstore/java/eu/siacs/conversations/services/MaintenanceReceiver.java similarity index 77% rename from src/playstore/java/de/pixart/messenger/services/MaintenanceReceiver.java rename to src/playstore/java/eu/siacs/conversations/services/MaintenanceReceiver.java index 31ed95a88d..886f5d4453 100644 --- a/src/playstore/java/de/pixart/messenger/services/MaintenanceReceiver.java +++ b/src/playstore/java/eu/siacs/conversations/services/MaintenanceReceiver.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; import android.content.BroadcastReceiver; import android.content.Context; @@ -9,16 +9,17 @@ import com.google.firebase.iid.FirebaseInstanceId; import java.io.IOException; -import de.pixart.messenger.Config; -import de.pixart.messenger.utils.Compatibility; +import eu.siacs.conversations.BuildConfig; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.utils.Compatibility; public class MaintenanceReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { Log.d(Config.LOGTAG, "received intent in maintenance receiver"); - if ("de.pixart.messenger.RENEW_INSTANCE_ID".equals(intent.getAction())) { + final String string = BuildConfig.APPLICATION_ID + ".RENEW_INSTANCE_ID"; + if (string.equals(intent.getAction())) { renewInstanceToken(context); - } } diff --git a/src/playstore/java/de/pixart/messenger/services/PushManagementService.java b/src/playstore/java/eu/siacs/conversations/services/PushManagementService.java similarity index 94% rename from src/playstore/java/de/pixart/messenger/services/PushManagementService.java rename to src/playstore/java/eu/siacs/conversations/services/PushManagementService.java index a7054cf2f5..83a5782d4e 100644 --- a/src/playstore/java/de/pixart/messenger/services/PushManagementService.java +++ b/src/playstore/java/eu/siacs/conversations/services/PushManagementService.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; import android.util.Log; @@ -7,16 +7,16 @@ import com.google.android.gms.common.GoogleApiAvailability; import com.google.firebase.iid.FirebaseInstanceId; import com.google.firebase.iid.InstanceIdResult; -import de.pixart.messenger.Config; -import de.pixart.messenger.R; -import de.pixart.messenger.entities.Account; -import de.pixart.messenger.entities.Conversation; -import de.pixart.messenger.utils.Namespace; -import de.pixart.messenger.utils.PhoneHelper; -import de.pixart.messenger.xml.Element; -import de.pixart.messenger.xmpp.XmppConnection; -import de.pixart.messenger.xmpp.forms.Data; -import de.pixart.messenger.xmpp.stanzas.IqPacket; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.utils.Namespace; +import eu.siacs.conversations.utils.PhoneHelper; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.XmppConnection; +import eu.siacs.conversations.xmpp.forms.Data; +import eu.siacs.conversations.xmpp.stanzas.IqPacket; import rocks.xmpp.addr.Jid; public class PushManagementService { diff --git a/src/playstore/java/de/pixart/messenger/services/PushMessageReceiver.java b/src/playstore/java/eu/siacs/conversations/services/PushMessageReceiver.java similarity index 90% rename from src/playstore/java/de/pixart/messenger/services/PushMessageReceiver.java rename to src/playstore/java/eu/siacs/conversations/services/PushMessageReceiver.java index c6d9b96beb..09ca4fb279 100644 --- a/src/playstore/java/de/pixart/messenger/services/PushMessageReceiver.java +++ b/src/playstore/java/eu/siacs/conversations/services/PushMessageReceiver.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.services; +package eu.siacs.conversations.services; import android.content.Intent; import android.util.Log; @@ -8,8 +8,8 @@ import com.google.firebase.messaging.RemoteMessage; import java.util.Map; -import de.pixart.messenger.Config; -import de.pixart.messenger.utils.Compatibility; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.utils.Compatibility; public class PushMessageReceiver extends FirebaseMessagingService { diff --git a/src/playstore/java/de/pixart/messenger/ui/widget/EmojiWrapperEditText.java b/src/playstore/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java similarity index 89% rename from src/playstore/java/de/pixart/messenger/ui/widget/EmojiWrapperEditText.java rename to src/playstore/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java index 662669fa3b..eed850a7fc 100644 --- a/src/playstore/java/de/pixart/messenger/ui/widget/EmojiWrapperEditText.java +++ b/src/playstore/java/eu/siacs/conversations/ui/widget/EmojiWrapperEditText.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.ui.widget; +package eu.siacs.conversations.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/src/playstore/java/de/pixart/messenger/utils/InstallReferrerUtils.java b/src/playstore/java/eu/siacs/conversations/utils/InstallReferrerUtils.java similarity index 94% rename from src/playstore/java/de/pixart/messenger/utils/InstallReferrerUtils.java rename to src/playstore/java/eu/siacs/conversations/utils/InstallReferrerUtils.java index 05824b9b28..797574c84e 100644 --- a/src/playstore/java/de/pixart/messenger/utils/InstallReferrerUtils.java +++ b/src/playstore/java/eu/siacs/conversations/utils/InstallReferrerUtils.java @@ -1,4 +1,4 @@ -package de.pixart.messenger.utils; +package eu.siacs.conversations.utils; import android.app.Activity; import android.content.SharedPreferences; @@ -10,8 +10,8 @@ import com.android.installreferrer.api.InstallReferrerClient; import com.android.installreferrer.api.InstallReferrerStateListener; import com.android.installreferrer.api.ReferrerDetails; -import de.pixart.messenger.Config; -import de.pixart.messenger.ui.WelcomeActivity; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.ui.WelcomeActivity; public class InstallReferrerUtils implements InstallReferrerStateListener {