diff options
Diffstat (limited to '')
-rw-r--r-- | src/main/java/de/pixart/messenger/Config.java (renamed from src/main/java/eu/siacs/conversations/Config.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/crypto/OtrService.java (renamed from src/main/java/eu/siacs/conversations/crypto/OtrService.java) | 20 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/crypto/PgpDecryptionService.java (renamed from src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java) | 12 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/crypto/PgpEngine.java (renamed from src/main/java/eu/siacs/conversations/crypto/PgpEngine.java) | 22 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/crypto/XmppDomainVerifier.java (renamed from src/main/java/eu/siacs/conversations/crypto/XmppDomainVerifier.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java (renamed from src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java) | 32 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/crypto/axolotl/CryptoFailedException.java (renamed from src/main/java/eu/siacs/conversations/crypto/axolotl/CryptoFailedException.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/crypto/axolotl/NoSessionsCreatedException.java (renamed from src/main/java/eu/siacs/conversations/crypto/axolotl/NoSessionsCreatedException.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/crypto/axolotl/OnMessageCreatedCallback.java (renamed from src/main/java/eu/siacs/conversations/crypto/axolotl/OnMessageCreatedCallback.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/crypto/axolotl/SQLiteAxolotlStore.java (renamed from src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlMessage.java (renamed from src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlSession.java (renamed from src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/crypto/sasl/DigestMd5.java (renamed from src/main/java/eu/siacs/conversations/crypto/sasl/DigestMd5.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/crypto/sasl/External.java (renamed from src/main/java/eu/siacs/conversations/crypto/sasl/External.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/crypto/sasl/Plain.java (renamed from src/main/java/eu/siacs/conversations/crypto/sasl/Plain.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/crypto/sasl/SaslMechanism.java (renamed from src/main/java/eu/siacs/conversations/crypto/sasl/SaslMechanism.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/crypto/sasl/ScramSha1.java (renamed from src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/crypto/sasl/Tokenizer.java (renamed from src/main/java/eu/siacs/conversations/crypto/sasl/Tokenizer.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/AbstractEntity.java (renamed from src/main/java/eu/siacs/conversations/entities/AbstractEntity.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Account.java (renamed from src/main/java/eu/siacs/conversations/entities/Account.java) | 18 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Blockable.java (renamed from src/main/java/eu/siacs/conversations/entities/Blockable.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Bookmark.java (renamed from src/main/java/eu/siacs/conversations/entities/Bookmark.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Contact.java (renamed from src/main/java/eu/siacs/conversations/entities/Contact.java) | 14 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Conversation.java (renamed from src/main/java/eu/siacs/conversations/entities/Conversation.java) | 14 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/DownloadableFile.java (renamed from src/main/java/eu/siacs/conversations/entities/DownloadableFile.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/ListItem.java (renamed from src/main/java/eu/siacs/conversations/entities/ListItem.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Message.java (renamed from src/main/java/eu/siacs/conversations/entities/Message.java) | 16 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/MucOptions.java (renamed from src/main/java/eu/siacs/conversations/entities/MucOptions.java) | 14 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Presence.java (renamed from src/main/java/eu/siacs/conversations/entities/Presence.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/PresenceTemplate.java (renamed from src/main/java/eu/siacs/conversations/entities/PresenceTemplate.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Presences.java (renamed from src/main/java/eu/siacs/conversations/entities/Presences.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Roster.java (renamed from src/main/java/eu/siacs/conversations/entities/Roster.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/ServiceDiscoveryResult.java (renamed from src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java) | 10 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Transferable.java (renamed from src/main/java/eu/siacs/conversations/entities/Transferable.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/TransferablePlaceholder.java (renamed from src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/generator/AbstractGenerator.java (renamed from src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java) | 14 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/generator/IqGenerator.java (renamed from src/main/java/eu/siacs/conversations/generator/IqGenerator.java) | 30 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/generator/MessageGenerator.java (renamed from src/main/java/eu/siacs/conversations/generator/MessageGenerator.java) | 26 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/generator/PresenceGenerator.java (renamed from src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java) | 14 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/http/HttpConnectionManager.java (renamed from src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java) | 12 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java (renamed from src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java) | 22 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/http/HttpUploadConnection.java (renamed from src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java) | 32 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/parser/AbstractParser.java (renamed from src/main/java/eu/siacs/conversations/parser/AbstractParser.java) | 18 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/parser/IqParser.java (renamed from src/main/java/eu/siacs/conversations/parser/IqParser.java) | 24 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/parser/MessageParser.java (renamed from src/main/java/eu/siacs/conversations/parser/MessageParser.java) | 46 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/parser/PresenceParser.java (renamed from src/main/java/eu/siacs/conversations/parser/PresenceParser.java) | 34 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java (renamed from src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java) | 28 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/persistance/FileBackend.java (renamed from src/main/java/eu/siacs/conversations/persistance/FileBackend.java) | 20 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/persistance/OnPhoneContactsMerged.java (renamed from src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/services/AbstractConnectionManager.java (renamed from src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/services/AvatarService.java (renamed from src/main/java/eu/siacs/conversations/services/AvatarService.java) | 24 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/services/CheckAppVersionService.java (renamed from src/main/java/eu/siacs/conversations/services/CheckAppVersionService.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/services/ContactChooserTargetService.java (renamed from src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/services/EventReceiver.java (renamed from src/main/java/eu/siacs/conversations/services/EventReceiver.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/services/ExportLogsService.java (renamed from src/main/java/eu/siacs/conversations/services/ExportLogsService.java) | 16 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/services/MessageArchiveService.java (renamed from src/main/java/eu/siacs/conversations/services/MessageArchiveService.java) | 22 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/services/NotificationService.java (renamed from src/main/java/eu/siacs/conversations/services/NotificationService.java) | 22 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/services/UpdaterWebService.java (renamed from src/main/java/eu/siacs/conversations/services/UpdaterWebService.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/services/XmppConnectionService.java (renamed from src/main/java/eu/siacs/conversations/services/XmppConnectionService.java) | 132 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/AboutActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/AboutActivity.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/AboutPreference.java (renamed from src/main/java/eu/siacs/conversations/ui/AboutPreference.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/AbstractSearchableListItemActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/BlockContactDialog.java (renamed from src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/BlocklistActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java) | 10 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ChangePasswordActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ChooseContactActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java) | 14 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java) | 28 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java) | 38 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/ConversationActivity.java) | 50 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationFragment.java (renamed from src/main/java/eu/siacs/conversations/ui/ConversationFragment.java) | 52 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/EditAccountActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java) | 38 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/EditMessage.java (renamed from src/main/java/eu/siacs/conversations/ui/EditMessage.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/EnterJidDialog.java (renamed from src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java) | 12 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ExportLogsPreference.java (renamed from src/main/java/eu/siacs/conversations/ui/ExportLogsPreference.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/MagicCreateActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java) | 12 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ManageAccountActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java) | 18 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java) | 16 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/RecordingActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/RecordingActivity.java) | 9 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/SetPresenceActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/SetPresenceActivity.java) | 14 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/SettingsActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/SettingsActivity.java) | 12 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/SettingsFragment.java (renamed from src/main/java/eu/siacs/conversations/ui/SettingsFragment.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ShareLocationActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ShareWithActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java) | 24 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ShowFullscreenMessageActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/ShowFullscreenMessageActivity.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ShowLocationActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/StartConversationActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java) | 36 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/StartUI.java (renamed from src/main/java/eu/siacs/conversations/ui/startUI.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/TimePreference.java (renamed from src/main/java/eu/siacs/conversations/ui/TimePreference.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java) | 18 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/UiCallback.java (renamed from src/main/java/eu/siacs/conversations/ui/UiCallback.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/UpdaterActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java) | 10 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/VerifyOTRActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java) | 20 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/WelcomeActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/XmppActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/XmppActivity.java) | 41 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java (renamed from src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java) | 10 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java (renamed from src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java) | 16 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/adapter/KnownHostsAdapter.java (renamed from src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java (renamed from src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java) | 10 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java (renamed from src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java) | 30 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/forms/FormBooleanFieldWrapper.java (renamed from src/main/java/eu/siacs/conversations/ui/forms/FormBooleanFieldWrapper.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/forms/FormFieldFactory.java (renamed from src/main/java/eu/siacs/conversations/ui/forms/FormFieldFactory.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/forms/FormFieldWrapper.java (renamed from src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/forms/FormJidSingleFieldWrapper.java (renamed from src/main/java/eu/siacs/conversations/ui/forms/FormJidSingleFieldWrapper.java) | 10 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/forms/FormTextFieldWrapper.java (renamed from src/main/java/eu/siacs/conversations/ui/forms/FormTextFieldWrapper.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/forms/FormWrapper.java (renamed from src/main/java/eu/siacs/conversations/ui/forms/FormWrapper.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/widget/Switch.java (renamed from src/main/java/eu/siacs/conversations/ui/widget/Switch.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/ConversationsFileObserver.java (renamed from src/main/java/eu/siacs/conversations/utils/ConversationsFileObserver.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/CryptoHelper.java (renamed from src/main/java/eu/siacs/conversations/utils/CryptoHelper.java) | 12 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/DNSHelper.java (renamed from src/main/java/eu/siacs/conversations/utils/DNSHelper.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/ExceptionHandler.java (renamed from src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/ExceptionHelper.java (renamed from src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java) | 20 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/ExifHelper.java (renamed from src/main/java/eu/siacs/conversations/utils/ExifHelper.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/FileUtils.java (renamed from src/main/java/eu/siacs/conversations/utils/FileUtils.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/GeoHelper.java (renamed from src/main/java/eu/siacs/conversations/utils/GeoHelper.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/MimeUtils.java (renamed from src/main/java/eu/siacs/conversations/utils/MimeUtils.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/OnPhoneContactsLoadedListener.java (renamed from src/main/java/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/PRNGFixes.java (renamed from src/main/java/eu/siacs/conversations/utils/PRNGFixes.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/PhoneHelper.java (renamed from src/main/java/eu/siacs/conversations/utils/PhoneHelper.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/ReplacingSerialSingleThreadExecutor.java (renamed from src/main/java/eu/siacs/conversations/utils/ReplacingSerialSingleThreadExecutor.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/SSLSocketHelper.java (renamed from src/main/java/eu/siacs/conversations/utils/SSLSocketHelper.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/SerialSingleThreadExecutor.java (renamed from src/main/java/eu/siacs/conversations/utils/SerialSingleThreadExecutor.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/SocksSocketFactory.java (renamed from src/main/java/eu/siacs/conversations/utils/SocksSocketFactory.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/UIHelper.java (renamed from src/main/java/eu/siacs/conversations/utils/UIHelper.java) | 18 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/XmlHelper.java (renamed from src/main/java/eu/siacs/conversations/utils/XmlHelper.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/Xmlns.java (renamed from src/main/java/eu/siacs/conversations/utils/Xmlns.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/utils/XmppUri.java (renamed from src/main/java/eu/siacs/conversations/utils/XmppUri.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xml/Element.java (renamed from src/main/java/eu/siacs/conversations/xml/Element.java) | 10 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xml/Tag.java (renamed from src/main/java/eu/siacs/conversations/xml/Tag.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xml/TagWriter.java (renamed from src/main/java/eu/siacs/conversations/xml/TagWriter.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xml/XmlReader.java (renamed from src/main/java/eu/siacs/conversations/xml/XmlReader.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/OnAdvancedStreamFeaturesLoaded.java (renamed from src/main/java/eu/siacs/conversations/xmpp/OnAdvancedStreamFeaturesLoaded.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/OnBindListener.java | 7 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/OnContactStatusChanged.java (renamed from src/main/java/eu/siacs/conversations/xmpp/OnContactStatusChanged.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/OnIqPacketReceived.java | 8 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/OnKeyStatusUpdated.java (renamed from src/main/java/eu/siacs/conversations/xmpp/OnKeyStatusUpdated.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/OnMessageAcknowledged.java (renamed from src/main/java/eu/siacs/conversations/xmpp/OnMessageAcknowledged.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/OnMessagePacketReceived.java (renamed from src/main/java/eu/siacs/conversations/xmpp/OnMessagePacketReceived.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/OnNewKeysAvailable.java (renamed from src/main/java/eu/siacs/conversations/xmpp/OnNewKeysAvailable.java) | 0 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/OnPresencePacketReceived.java (renamed from src/main/java/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/OnStatusChanged.java (renamed from src/main/java/eu/siacs/conversations/xmpp/OnStatusChanged.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/OnUpdateBlocklist.java (renamed from src/main/java/eu/siacs/conversations/xmpp/OnUpdateBlocklist.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/PacketReceived.java (renamed from src/main/java/eu/siacs/conversations/xmpp/PacketReceived.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/XmppConnection.java (renamed from src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java) | 76 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/chatstate/ChatState.java (renamed from src/main/java/eu/siacs/conversations/xmpp/chatstate/ChatState.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/forms/Data.java (renamed from src/main/java/eu/siacs/conversations/xmpp/forms/Data.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/forms/Field.java (renamed from src/main/java/eu/siacs/conversations/xmpp/forms/Field.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jid/InvalidJidException.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jid/InvalidJidException.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jid/Jid.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jid/Jid.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/JingleCandidate.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java) | 46 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnectionManager.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java) | 26 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/JingleInbandTransport.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java) | 20 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/JingleSocks5Transport.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java) | 14 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/JingleTransport.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/JingleTransport.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/OnFileTransmissionStatusChanged.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/OnJinglePacketReceived.java | 9 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/OnPrimaryCandidateFound.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/OnTransportConnected.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Content.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/JinglePacket.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Reason.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/pep/Avatar.java (renamed from src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractAcknowledgeableStanza.java (renamed from src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractAcknowledgeableStanza.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractStanza.java (renamed from src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/stanzas/IqPacket.java (renamed from src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/stanzas/MessagePacket.java (renamed from src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/stanzas/PresencePacket.java (renamed from src/main/java/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/stanzas/csi/ActivePacket.java (renamed from src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/stanzas/csi/InactivePacket.java (renamed from src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/AckPacket.java (renamed from src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/EnablePacket.java (renamed from src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/RequestPacket.java (renamed from src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/ResumePacket.java (renamed from src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java) | 4 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/OnBindListener.java | 7 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/OnIqPacketReceived.java | 8 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/jingle/OnJinglePacketReceived.java | 9 |
176 files changed, 998 insertions, 1000 deletions
diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/de/pixart/messenger/Config.java index 10eb944c3..822da1000 100644 --- a/src/main/java/eu/siacs/conversations/Config.java +++ b/src/main/java/de/pixart/messenger/Config.java @@ -1,8 +1,8 @@ -package eu.siacs.conversations; +package de.pixart.messenger; import android.graphics.Bitmap; -import eu.siacs.conversations.xmpp.chatstate.ChatState; +import de.pixart.messenger.xmpp.chatstate.ChatState; public final class Config { diff --git a/src/main/java/eu/siacs/conversations/crypto/OtrService.java b/src/main/java/de/pixart/messenger/crypto/OtrService.java index af11756f6..5a43e711d 100644 --- a/src/main/java/eu/siacs/conversations/crypto/OtrService.java +++ b/src/main/java/de/pixart/messenger/crypto/OtrService.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.crypto; +package de.pixart.messenger.crypto; import android.util.Log; @@ -26,15 +26,15 @@ import java.security.spec.DSAPrivateKeySpec; import java.security.spec.DSAPublicKeySpec; import java.security.spec.InvalidKeySpecException; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.generator.MessageGenerator; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.xmpp.chatstate.ChatState; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.stanzas.MessagePacket; +import de.pixart.messenger.Config; +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.entities.Conversation; +import de.pixart.messenger.generator.MessageGenerator; +import de.pixart.messenger.services.XmppConnectionService; +import de.pixart.messenger.xmpp.chatstate.ChatState; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.stanzas.MessagePacket; public class OtrService extends OtrCryptoEngineImpl implements OtrEngineHost { diff --git a/src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java b/src/main/java/de/pixart/messenger/crypto/PgpDecryptionService.java index 537687148..02c094b71 100644 --- a/src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java +++ b/src/main/java/de/pixart/messenger/crypto/PgpDecryptionService.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.crypto; +package de.pixart.messenger.crypto; import android.app.PendingIntent; import android.content.Intent; @@ -17,11 +17,11 @@ import java.util.ArrayDeque; import java.util.HashSet; import java.util.List; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.entities.DownloadableFile; -import eu.siacs.conversations.entities.Message; -import eu.siacs.conversations.http.HttpConnectionManager; -import eu.siacs.conversations.services.XmppConnectionService; +import de.pixart.messenger.entities.Conversation; +import de.pixart.messenger.entities.DownloadableFile; +import de.pixart.messenger.entities.Message; +import de.pixart.messenger.http.HttpConnectionManager; +import de.pixart.messenger.services.XmppConnectionService; public class PgpDecryptionService { diff --git a/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java b/src/main/java/de/pixart/messenger/crypto/PgpEngine.java index 4ffb94be5..6c272f941 100644 --- a/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java +++ b/src/main/java/de/pixart/messenger/crypto/PgpEngine.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.crypto; +package de.pixart.messenger.crypto; import android.app.PendingIntent; import android.content.Intent; @@ -16,16 +16,16 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -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.DownloadableFile; -import eu.siacs.conversations.entities.Message; -import eu.siacs.conversations.persistance.FileBackend; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.ui.UiCallback; +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.DownloadableFile; +import de.pixart.messenger.entities.Message; +import de.pixart.messenger.persistance.FileBackend; +import de.pixart.messenger.services.XmppConnectionService; +import de.pixart.messenger.ui.UiCallback; public class PgpEngine { private OpenPgpApi api; diff --git a/src/main/java/eu/siacs/conversations/crypto/XmppDomainVerifier.java b/src/main/java/de/pixart/messenger/crypto/XmppDomainVerifier.java index 1fca865ed..250516daa 100644 --- a/src/main/java/eu/siacs/conversations/crypto/XmppDomainVerifier.java +++ b/src/main/java/de/pixart/messenger/crypto/XmppDomainVerifier.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.crypto; +package de.pixart.messenger.crypto; import android.util.Log; import android.util.Pair; diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java index 9e54c0c7d..302ad3164 100644 --- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java +++ b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.crypto.axolotl; +package de.pixart.messenger.crypto.axolotl; import android.os.Bundle; import android.security.KeyChain; @@ -33,21 +33,21 @@ import java.util.Map; import java.util.Random; import java.util.Set; -import eu.siacs.conversations.Config; -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.parser.IqParser; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.utils.CryptoHelper; -import eu.siacs.conversations.utils.SerialSingleThreadExecutor; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.OnAdvancedStreamFeaturesLoaded; -import eu.siacs.conversations.xmpp.OnIqPacketReceived; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.stanzas.IqPacket; +import de.pixart.messenger.Config; +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.parser.IqParser; +import de.pixart.messenger.services.XmppConnectionService; +import de.pixart.messenger.utils.CryptoHelper; +import de.pixart.messenger.utils.SerialSingleThreadExecutor; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.OnAdvancedStreamFeaturesLoaded; +import de.pixart.messenger.xmpp.OnIqPacketReceived; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.stanzas.IqPacket; public class AxolotlService implements OnAdvancedStreamFeaturesLoaded { diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/CryptoFailedException.java b/src/main/java/de/pixart/messenger/crypto/axolotl/CryptoFailedException.java index 5796ef30e..b29d7cb30 100644 --- a/src/main/java/eu/siacs/conversations/crypto/axolotl/CryptoFailedException.java +++ b/src/main/java/de/pixart/messenger/crypto/axolotl/CryptoFailedException.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.crypto.axolotl; +package de.pixart.messenger.crypto.axolotl; public class CryptoFailedException extends Exception { public CryptoFailedException(Exception e){ diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/NoSessionsCreatedException.java b/src/main/java/de/pixart/messenger/crypto/axolotl/NoSessionsCreatedException.java index 663b42b58..5d0a7547a 100644 --- a/src/main/java/eu/siacs/conversations/crypto/axolotl/NoSessionsCreatedException.java +++ b/src/main/java/de/pixart/messenger/crypto/axolotl/NoSessionsCreatedException.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.crypto.axolotl; +package de.pixart.messenger.crypto.axolotl; public class NoSessionsCreatedException extends Throwable{ } diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/OnMessageCreatedCallback.java b/src/main/java/de/pixart/messenger/crypto/axolotl/OnMessageCreatedCallback.java index 3d40a4089..a6daeb196 100644 --- a/src/main/java/eu/siacs/conversations/crypto/axolotl/OnMessageCreatedCallback.java +++ b/src/main/java/de/pixart/messenger/crypto/axolotl/OnMessageCreatedCallback.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.crypto.axolotl; +package de.pixart.messenger.crypto.axolotl; public interface OnMessageCreatedCallback { void run(XmppAxolotlMessage message); diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java b/src/main/java/de/pixart/messenger/crypto/axolotl/SQLiteAxolotlStore.java index 4eb73313d..7f28ad09e 100644 --- a/src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java +++ b/src/main/java/de/pixart/messenger/crypto/axolotl/SQLiteAxolotlStore.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.crypto.axolotl; +package de.pixart.messenger.crypto.axolotl; import android.util.Log; import android.util.LruCache; @@ -19,9 +19,9 @@ import java.security.cert.X509Certificate; import java.util.List; import java.util.Set; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.services.XmppConnectionService; +import de.pixart.messenger.Config; +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.services.XmppConnectionService; public class SQLiteAxolotlStore implements AxolotlStore { diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java b/src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlMessage.java index e8ec54263..fa37044d4 100644 --- a/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java +++ b/src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlMessage.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.crypto.axolotl; +package de.pixart.messenger.crypto.axolotl; import android.util.Base64; import android.util.Log; @@ -21,9 +21,9 @@ import javax.crypto.SecretKey; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.Config; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.jid.Jid; public class XmppAxolotlMessage { public static final String CONTAINERTAG = "encrypted"; diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java b/src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlSession.java index b7d11ec02..c2cb2a3e7 100644 --- a/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java +++ b/src/main/java/de/pixart/messenger/crypto/axolotl/XmppAxolotlSession.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.crypto.axolotl; +package de.pixart.messenger.crypto.axolotl; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -22,8 +22,8 @@ import org.whispersystems.libaxolotl.protocol.WhisperMessage; import java.util.HashMap; import java.util.Map; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.entities.Account; +import de.pixart.messenger.Config; +import de.pixart.messenger.entities.Account; public class XmppAxolotlSession { private final SessionCipher cipher; diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/DigestMd5.java b/src/main/java/de/pixart/messenger/crypto/sasl/DigestMd5.java index 8b16215bd..09ac4865a 100644 --- a/src/main/java/eu/siacs/conversations/crypto/sasl/DigestMd5.java +++ b/src/main/java/de/pixart/messenger/crypto/sasl/DigestMd5.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.crypto.sasl; +package de.pixart.messenger.crypto.sasl; import android.util.Base64; @@ -8,9 +8,9 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.utils.CryptoHelper; -import eu.siacs.conversations.xml.TagWriter; +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.utils.CryptoHelper; +import de.pixart.messenger.xml.TagWriter; public class DigestMd5 extends SaslMechanism { public DigestMd5(final TagWriter tagWriter, final Account account, final SecureRandom rng) { diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/External.java b/src/main/java/de/pixart/messenger/crypto/sasl/External.java index 8fd91cf47..a1a79a0a8 100644 --- a/src/main/java/eu/siacs/conversations/crypto/sasl/External.java +++ b/src/main/java/de/pixart/messenger/crypto/sasl/External.java @@ -1,11 +1,11 @@ -package eu.siacs.conversations.crypto.sasl; +package de.pixart.messenger.crypto.sasl; import android.util.Base64; import java.security.SecureRandom; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.xml.TagWriter; +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.xml.TagWriter; public class External extends SaslMechanism { diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/Plain.java b/src/main/java/de/pixart/messenger/crypto/sasl/Plain.java index 40a551515..d0aa90b49 100644 --- a/src/main/java/eu/siacs/conversations/crypto/sasl/Plain.java +++ b/src/main/java/de/pixart/messenger/crypto/sasl/Plain.java @@ -1,11 +1,11 @@ -package eu.siacs.conversations.crypto.sasl; +package de.pixart.messenger.crypto.sasl; import android.util.Base64; import java.nio.charset.Charset; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.xml.TagWriter; +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.xml.TagWriter; public class Plain extends SaslMechanism { public Plain(final TagWriter tagWriter, final Account account) { diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/SaslMechanism.java b/src/main/java/de/pixart/messenger/crypto/sasl/SaslMechanism.java index 5b4b99efb..19e8f3591 100644 --- a/src/main/java/eu/siacs/conversations/crypto/sasl/SaslMechanism.java +++ b/src/main/java/de/pixart/messenger/crypto/sasl/SaslMechanism.java @@ -1,9 +1,9 @@ -package eu.siacs.conversations.crypto.sasl; +package de.pixart.messenger.crypto.sasl; import java.security.SecureRandom; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.xml.TagWriter; +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.xml.TagWriter; public abstract class SaslMechanism { diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java b/src/main/java/de/pixart/messenger/crypto/sasl/ScramSha1.java index f40eec552..abff542d4 100644 --- a/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java +++ b/src/main/java/de/pixart/messenger/crypto/sasl/ScramSha1.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.crypto.sasl; +package de.pixart.messenger.crypto.sasl; import android.util.Base64; import android.util.LruCache; @@ -13,9 +13,9 @@ import java.nio.charset.Charset; import java.security.InvalidKeyException; import java.security.SecureRandom; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.utils.CryptoHelper; -import eu.siacs.conversations.xml.TagWriter; +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.utils.CryptoHelper; +import de.pixart.messenger.xml.TagWriter; public class ScramSha1 extends SaslMechanism { // TODO: When channel binding (SCRAM-SHA1-PLUS) is supported in future, generalize this to indicate support and/or usage. diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/Tokenizer.java b/src/main/java/de/pixart/messenger/crypto/sasl/Tokenizer.java index e37e0fa71..01cd07929 100644 --- a/src/main/java/eu/siacs/conversations/crypto/sasl/Tokenizer.java +++ b/src/main/java/de/pixart/messenger/crypto/sasl/Tokenizer.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.crypto.sasl; +package de.pixart.messenger.crypto.sasl; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/eu/siacs/conversations/entities/AbstractEntity.java b/src/main/java/de/pixart/messenger/entities/AbstractEntity.java index 957b0a146..1194cb819 100644 --- a/src/main/java/eu/siacs/conversations/entities/AbstractEntity.java +++ b/src/main/java/de/pixart/messenger/entities/AbstractEntity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import android.content.ContentValues; diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/de/pixart/messenger/entities/Account.java index c7359829c..8c9ed51f2 100644 --- a/src/main/java/eu/siacs/conversations/entities/Account.java +++ b/src/main/java/de/pixart/messenger/entities/Account.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import android.content.ContentValues; import android.database.Cursor; @@ -19,14 +19,14 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArraySet; -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.services.XmppConnectionService; -import eu.siacs.conversations.xmpp.XmppConnection; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +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.services.XmppConnectionService; +import de.pixart.messenger.xmpp.XmppConnection; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; public class Account extends AbstractEntity { diff --git a/src/main/java/eu/siacs/conversations/entities/Blockable.java b/src/main/java/de/pixart/messenger/entities/Blockable.java index dbcd55c43..07860bcfe 100644 --- a/src/main/java/eu/siacs/conversations/entities/Blockable.java +++ b/src/main/java/de/pixart/messenger/entities/Blockable.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.jid.Jid; public interface Blockable { public boolean isBlocked(); diff --git a/src/main/java/eu/siacs/conversations/entities/Bookmark.java b/src/main/java/de/pixart/messenger/entities/Bookmark.java index e6aeadf4a..9c99a2baf 100644 --- a/src/main/java/eu/siacs/conversations/entities/Bookmark.java +++ b/src/main/java/de/pixart/messenger/entities/Bookmark.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import android.content.Context; @@ -6,9 +6,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import eu.siacs.conversations.utils.UIHelper; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.utils.UIHelper; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.jid.Jid; public class Bookmark extends Element implements ListItem { diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/de/pixart/messenger/entities/Contact.java index f48a052f8..b4908d08c 100644 --- a/src/main/java/eu/siacs/conversations/entities/Contact.java +++ b/src/main/java/de/pixart/messenger/entities/Contact.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import android.content.ContentValues; import android.content.Context; @@ -12,12 +12,12 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.utils.UIHelper; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.pep.Avatar; +import de.pixart.messenger.Config; +import de.pixart.messenger.utils.UIHelper; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.pep.Avatar; public class Contact implements ListItem, Blockable { public static final String TABLENAME = "contacts"; diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java index ee47f87a0..11eff3f6e 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/de/pixart/messenger/entities/Conversation.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import android.content.ContentValues; import android.database.Cursor; @@ -21,12 +21,12 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.crypto.PgpDecryptionService; -import eu.siacs.conversations.crypto.axolotl.AxolotlService; -import eu.siacs.conversations.xmpp.chatstate.ChatState; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.Config; +import de.pixart.messenger.crypto.PgpDecryptionService; +import de.pixart.messenger.crypto.axolotl.AxolotlService; +import de.pixart.messenger.xmpp.chatstate.ChatState; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; public class Conversation extends AbstractEntity implements Blockable, Comparable<Conversation> { diff --git a/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java b/src/main/java/de/pixart/messenger/entities/DownloadableFile.java index 4e63a66ab..1a6e88881 100644 --- a/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java +++ b/src/main/java/de/pixart/messenger/entities/DownloadableFile.java @@ -1,8 +1,8 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import java.io.File; -import eu.siacs.conversations.utils.MimeUtils; +import de.pixart.messenger.utils.MimeUtils; public class DownloadableFile extends File { diff --git a/src/main/java/eu/siacs/conversations/entities/ListItem.java b/src/main/java/de/pixart/messenger/entities/ListItem.java index 178df2d16..cb0644499 100644 --- a/src/main/java/eu/siacs/conversations/entities/ListItem.java +++ b/src/main/java/de/pixart/messenger/entities/ListItem.java @@ -1,10 +1,10 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import android.content.Context; import java.util.List; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.jid.Jid; public interface ListItem extends Comparable<ListItem> { String getDisplayName(); diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/de/pixart/messenger/entities/Message.java index 357af7643..3145cdccf 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/src/main/java/de/pixart/messenger/entities/Message.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import android.content.ContentValues; import android.database.Cursor; @@ -6,13 +6,13 @@ import android.database.Cursor; import java.net.MalformedURLException; import java.net.URL; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession; -import eu.siacs.conversations.utils.GeoHelper; -import eu.siacs.conversations.utils.MimeUtils; -import eu.siacs.conversations.utils.UIHelper; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.Config; +import de.pixart.messenger.crypto.axolotl.XmppAxolotlSession; +import de.pixart.messenger.utils.GeoHelper; +import de.pixart.messenger.utils.MimeUtils; +import de.pixart.messenger.utils.UIHelper; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; public class Message extends AbstractEntity { diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/de/pixart/messenger/entities/MucOptions.java index bccf3d009..da2045d26 100644 --- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java +++ b/src/main/java/de/pixart/messenger/entities/MucOptions.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import android.annotation.SuppressLint; @@ -7,12 +7,12 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import eu.siacs.conversations.R; -import eu.siacs.conversations.xmpp.forms.Data; -import eu.siacs.conversations.xmpp.forms.Field; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.pep.Avatar; +import de.pixart.messenger.R; +import de.pixart.messenger.xmpp.forms.Data; +import de.pixart.messenger.xmpp.forms.Field; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.pep.Avatar; @SuppressLint("DefaultLocale") public class MucOptions { diff --git a/src/main/java/eu/siacs/conversations/entities/Presence.java b/src/main/java/de/pixart/messenger/entities/Presence.java index eefe73fc0..fe7bac6ee 100644 --- a/src/main/java/eu/siacs/conversations/entities/Presence.java +++ b/src/main/java/de/pixart/messenger/entities/Presence.java @@ -1,8 +1,8 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import java.util.Locale; -import eu.siacs.conversations.xml.Element; +import de.pixart.messenger.xml.Element; public class Presence implements Comparable { diff --git a/src/main/java/eu/siacs/conversations/entities/PresenceTemplate.java b/src/main/java/de/pixart/messenger/entities/PresenceTemplate.java index c268b24c2..b8bd167db 100644 --- a/src/main/java/eu/siacs/conversations/entities/PresenceTemplate.java +++ b/src/main/java/de/pixart/messenger/entities/PresenceTemplate.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import android.content.ContentValues; import android.database.Cursor; diff --git a/src/main/java/eu/siacs/conversations/entities/Presences.java b/src/main/java/de/pixart/messenger/entities/Presences.java index 773e44e72..ecd826d41 100644 --- a/src/main/java/eu/siacs/conversations/entities/Presences.java +++ b/src/main/java/de/pixart/messenger/entities/Presences.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import java.util.ArrayList; import java.util.Hashtable; diff --git a/src/main/java/eu/siacs/conversations/entities/Roster.java b/src/main/java/de/pixart/messenger/entities/Roster.java index d3ad91816..e267142bc 100644 --- a/src/main/java/eu/siacs/conversations/entities/Roster.java +++ b/src/main/java/de/pixart/messenger/entities/Roster.java @@ -1,11 +1,11 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.jid.Jid; public class Roster { final Account account; diff --git a/src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java b/src/main/java/de/pixart/messenger/entities/ServiceDiscoveryResult.java index 4de7c7e7a..cac20ba90 100644 --- a/src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java +++ b/src/main/java/de/pixart/messenger/entities/ServiceDiscoveryResult.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import android.content.ContentValues; import android.database.Cursor; @@ -16,10 +16,10 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -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; +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; public class ServiceDiscoveryResult { public static final String TABLENAME = "discovery_results"; diff --git a/src/main/java/eu/siacs/conversations/entities/Transferable.java b/src/main/java/de/pixart/messenger/entities/Transferable.java index 1ce4d8ccf..14132ac38 100644 --- a/src/main/java/eu/siacs/conversations/entities/Transferable.java +++ b/src/main/java/de/pixart/messenger/entities/Transferable.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java b/src/main/java/de/pixart/messenger/entities/TransferablePlaceholder.java index e065953ef..59f1dc846 100644 --- a/src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java +++ b/src/main/java/de/pixart/messenger/entities/TransferablePlaceholder.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; public class TransferablePlaceholder implements Transferable { diff --git a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java b/src/main/java/de/pixart/messenger/generator/AbstractGenerator.java index eb90ac7b1..bb68dae7b 100644 --- a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java +++ b/src/main/java/de/pixart/messenger/generator/AbstractGenerator.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.generator; +package de.pixart.messenger.generator; import android.util.Base64; @@ -12,12 +12,12 @@ import java.util.List; import java.util.Locale; import java.util.TimeZone; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -import eu.siacs.conversations.crypto.axolotl.AxolotlService; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.utils.PhoneHelper; -import eu.siacs.conversations.xmpp.jingle.stanzas.Content; +import de.pixart.messenger.Config; +import de.pixart.messenger.R; +import de.pixart.messenger.crypto.axolotl.AxolotlService; +import de.pixart.messenger.services.XmppConnectionService; +import de.pixart.messenger.utils.PhoneHelper; +import de.pixart.messenger.xmpp.jingle.stanzas.Content; public abstract class AbstractGenerator { private final String[] FEATURES = { diff --git a/src/main/java/eu/siacs/conversations/generator/IqGenerator.java b/src/main/java/de/pixart/messenger/generator/IqGenerator.java index ad650c3ef..b8d79d953 100644 --- a/src/main/java/eu/siacs/conversations/generator/IqGenerator.java +++ b/src/main/java/de/pixart/messenger/generator/IqGenerator.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.generator; +package de.pixart.messenger.generator; import android.os.Bundle; @@ -17,20 +17,20 @@ import java.util.List; import java.util.Set; import java.util.TimeZone; -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.Conversation; -import eu.siacs.conversations.entities.DownloadableFile; -import eu.siacs.conversations.services.MessageArchiveService; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.utils.Xmlns; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.forms.Data; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.pep.Avatar; -import eu.siacs.conversations.xmpp.stanzas.IqPacket; +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.Conversation; +import de.pixart.messenger.entities.DownloadableFile; +import de.pixart.messenger.services.MessageArchiveService; +import de.pixart.messenger.services.XmppConnectionService; +import de.pixart.messenger.utils.Xmlns; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.forms.Data; +import de.pixart.messenger.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.pep.Avatar; +import de.pixart.messenger.xmpp.stanzas.IqPacket; public class IqGenerator extends AbstractGenerator { diff --git a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/de/pixart/messenger/generator/MessageGenerator.java index 5ef47a335..bf64f5bfd 100644 --- a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java +++ b/src/main/java/de/pixart/messenger/generator/MessageGenerator.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.generator; +package de.pixart.messenger.generator; import net.java.otr4j.OtrException; import net.java.otr4j.session.Session; @@ -9,18 +9,18 @@ import java.util.Date; import java.util.Locale; import java.util.TimeZone; -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.Contact; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.entities.Message; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.chatstate.ChatState; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.stanzas.MessagePacket; +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.Contact; +import de.pixart.messenger.entities.Conversation; +import de.pixart.messenger.entities.Message; +import de.pixart.messenger.services.XmppConnectionService; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.chatstate.ChatState; +import de.pixart.messenger.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.stanzas.MessagePacket; public class MessageGenerator extends AbstractGenerator { public static final String OTR_FALLBACK_MESSAGE = "I would like to start a private (OTR encrypted) conversation but your client doesn’t seem to support that"; diff --git a/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java b/src/main/java/de/pixart/messenger/generator/PresenceGenerator.java index f9fed9140..b20a4b34e 100644 --- a/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java +++ b/src/main/java/de/pixart/messenger/generator/PresenceGenerator.java @@ -1,11 +1,11 @@ -package eu.siacs.conversations.generator; +package de.pixart.messenger.generator; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Contact; -import eu.siacs.conversations.entities.Presence; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.stanzas.PresencePacket; +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.entities.Contact; +import de.pixart.messenger.entities.Presence; +import de.pixart.messenger.services.XmppConnectionService; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.stanzas.PresencePacket; public class PresenceGenerator extends AbstractGenerator { diff --git a/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java b/src/main/java/de/pixart/messenger/http/HttpConnectionManager.java index f105646f0..b8ee031b3 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java +++ b/src/main/java/de/pixart/messenger/http/HttpConnectionManager.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.http; +package de.pixart.messenger.http; import org.apache.http.conn.ssl.StrictHostnameVerifier; @@ -17,11 +17,11 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.X509TrustManager; -import eu.siacs.conversations.entities.Message; -import eu.siacs.conversations.services.AbstractConnectionManager; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.utils.CryptoHelper; -import eu.siacs.conversations.utils.SSLSocketHelper; +import de.pixart.messenger.entities.Message; +import de.pixart.messenger.services.AbstractConnectionManager; +import de.pixart.messenger.services.XmppConnectionService; +import de.pixart.messenger.utils.CryptoHelper; +import de.pixart.messenger.utils.SSLSocketHelper; public class HttpConnectionManager extends AbstractConnectionManager { diff --git a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java b/src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java index 59116d993..ae897a8e7 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java +++ b/src/main/java/de/pixart/messenger/http/HttpDownloadConnection.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.http; +package de.pixart.messenger.http; import android.os.PowerManager; import android.util.Log; @@ -18,16 +18,16 @@ import java.util.concurrent.CancellationException; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLHandshakeException; -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.entities.Transferable; -import eu.siacs.conversations.entities.TransferablePlaceholder; -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 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.entities.Transferable; +import de.pixart.messenger.entities.TransferablePlaceholder; +import de.pixart.messenger.persistance.FileBackend; +import de.pixart.messenger.services.AbstractConnectionManager; +import de.pixart.messenger.services.XmppConnectionService; +import de.pixart.messenger.utils.CryptoHelper; public class HttpDownloadConnection implements Transferable { diff --git a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java b/src/main/java/de/pixart/messenger/http/HttpUploadConnection.java index 72ab6db46..1e30a902a 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java +++ b/src/main/java/de/pixart/messenger/http/HttpUploadConnection.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.http; +package de.pixart.messenger.http; import android.app.PendingIntent; import android.os.PowerManager; @@ -15,21 +15,21 @@ import java.net.URL; import javax.net.ssl.HttpsURLConnection; -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.ui.UiCallback; -import eu.siacs.conversations.utils.CryptoHelper; -import eu.siacs.conversations.utils.Xmlns; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.OnIqPacketReceived; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.stanzas.IqPacket; +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.ui.UiCallback; +import de.pixart.messenger.utils.CryptoHelper; +import de.pixart.messenger.utils.Xmlns; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.OnIqPacketReceived; +import de.pixart.messenger.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.stanzas.IqPacket; public class HttpUploadConnection implements Transferable { diff --git a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java b/src/main/java/de/pixart/messenger/parser/AbstractParser.java index 4699d2868..abde7019b 100644 --- a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java +++ b/src/main/java/de/pixart/messenger/parser/AbstractParser.java @@ -1,17 +1,17 @@ -package eu.siacs.conversations.parser; +package de.pixart.messenger.parser; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Locale; -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.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +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.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; public abstract class AbstractParser { diff --git a/src/main/java/eu/siacs/conversations/parser/IqParser.java b/src/main/java/de/pixart/messenger/parser/IqParser.java index 4e925e97d..64fe7395a 100644 --- a/src/main/java/eu/siacs/conversations/parser/IqParser.java +++ b/src/main/java/de/pixart/messenger/parser/IqParser.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.parser; +package de.pixart.messenger.parser; import android.support.annotation.NonNull; import android.util.Base64; @@ -22,17 +22,17 @@ import java.util.List; import java.util.Map; import java.util.Set; -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.services.XmppConnectionService; -import eu.siacs.conversations.utils.Xmlns; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.OnIqPacketReceived; -import eu.siacs.conversations.xmpp.OnUpdateBlocklist; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.stanzas.IqPacket; +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.services.XmppConnectionService; +import de.pixart.messenger.utils.Xmlns; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.OnIqPacketReceived; +import de.pixart.messenger.xmpp.OnUpdateBlocklist; +import de.pixart.messenger.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.stanzas.IqPacket; public class IqParser extends AbstractParser implements OnIqPacketReceived { diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/de/pixart/messenger/parser/MessageParser.java index f3958621c..fa2d1f642 100644 --- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java +++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.parser; +package de.pixart.messenger.parser; import android.text.Html; import android.util.Log; @@ -15,28 +15,28 @@ import java.util.List; import java.util.Set; import java.util.UUID; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.crypto.OtrService; -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.Bookmark; -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.entities.ServiceDiscoveryResult; -import eu.siacs.conversations.http.HttpConnectionManager; -import eu.siacs.conversations.services.MessageArchiveService; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.utils.CryptoHelper; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.OnMessagePacketReceived; -import eu.siacs.conversations.xmpp.chatstate.ChatState; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.pep.Avatar; -import eu.siacs.conversations.xmpp.stanzas.MessagePacket; +import de.pixart.messenger.Config; +import de.pixart.messenger.crypto.OtrService; +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.Bookmark; +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.entities.ServiceDiscoveryResult; +import de.pixart.messenger.http.HttpConnectionManager; +import de.pixart.messenger.services.MessageArchiveService; +import de.pixart.messenger.services.XmppConnectionService; +import de.pixart.messenger.utils.CryptoHelper; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.OnMessagePacketReceived; +import de.pixart.messenger.xmpp.chatstate.ChatState; +import de.pixart.messenger.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.pep.Avatar; +import de.pixart.messenger.xmpp.stanzas.MessagePacket; public class MessageParser extends AbstractParser implements OnMessagePacketReceived { diff --git a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java b/src/main/java/de/pixart/messenger/parser/PresenceParser.java index 30732fd2d..c2e1f3c70 100644 --- a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java +++ b/src/main/java/de/pixart/messenger/parser/PresenceParser.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.parser; +package de.pixart.messenger.parser; import android.util.Log; @@ -6,22 +6,22 @@ import java.text.ParseException; import java.util.ArrayList; import java.util.List; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.crypto.PgpEngine; -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.xml.Element; -import eu.siacs.conversations.xmpp.OnPresencePacketReceived; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.pep.Avatar; -import eu.siacs.conversations.xmpp.stanzas.PresencePacket; +import de.pixart.messenger.Config; +import de.pixart.messenger.crypto.PgpEngine; +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.xml.Element; +import de.pixart.messenger.xmpp.OnPresencePacketReceived; +import de.pixart.messenger.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.pep.Avatar; +import de.pixart.messenger.xmpp.stanzas.PresencePacket; public class PresenceParser extends AbstractParser implements OnPresencePacketReceived { diff --git a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java b/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java index 2c1449122..256720be5 100644 --- a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java +++ b/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.persistance; +package de.pixart.messenger.persistance; import android.content.ContentValues; import android.content.Context; @@ -33,19 +33,19 @@ import java.util.List; import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.crypto.axolotl.AxolotlService; -import eu.siacs.conversations.crypto.axolotl.SQLiteAxolotlStore; -import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession; -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.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.Config; +import de.pixart.messenger.crypto.axolotl.AxolotlService; +import de.pixart.messenger.crypto.axolotl.SQLiteAxolotlStore; +import de.pixart.messenger.crypto.axolotl.XmppAxolotlSession; +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.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; public class DatabaseBackend extends SQLiteOpenHelper { diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/de/pixart/messenger/persistance/FileBackend.java index 6d4fdba0e..4fab799b9 100644 --- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java +++ b/src/main/java/de/pixart/messenger/persistance/FileBackend.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.persistance; +package de.pixart.messenger.persistance; import android.annotation.TargetApi; import android.content.ContentResolver; @@ -45,15 +45,15 @@ import java.util.Date; import java.util.List; import java.util.Locale; -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.XmppConnectionService; -import eu.siacs.conversations.utils.CryptoHelper; -import eu.siacs.conversations.utils.ExifHelper; -import eu.siacs.conversations.utils.FileUtils; -import eu.siacs.conversations.xmpp.pep.Avatar; +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.XmppConnectionService; +import de.pixart.messenger.utils.CryptoHelper; +import de.pixart.messenger.utils.ExifHelper; +import de.pixart.messenger.utils.FileUtils; +import de.pixart.messenger.xmpp.pep.Avatar; public class FileBackend { private final SimpleDateFormat fileDateFormat = new SimpleDateFormat("yyyyMMdd_HHmmssSSS", Locale.US); diff --git a/src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java b/src/main/java/de/pixart/messenger/persistance/OnPhoneContactsMerged.java index 6a457b17f..85e852b5d 100644 --- a/src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java +++ b/src/main/java/de/pixart/messenger/persistance/OnPhoneContactsMerged.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.persistance; +package de.pixart.messenger.persistance; public interface OnPhoneContactsMerged { public void phoneContactsMerged(); diff --git a/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java b/src/main/java/de/pixart/messenger/services/AbstractConnectionManager.java index 50bb83d30..9228d0055 100644 --- a/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java +++ b/src/main/java/de/pixart/messenger/services/AbstractConnectionManager.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.services; +package de.pixart.messenger.services; import android.Manifest; import android.content.Context; @@ -30,8 +30,8 @@ import javax.crypto.NoSuchPaddingException; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.entities.DownloadableFile; +import de.pixart.messenger.Config; +import de.pixart.messenger.entities.DownloadableFile; public class AbstractConnectionManager { protected XmppConnectionService mXmppConnectionService; diff --git a/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/de/pixart/messenger/services/AvatarService.java index be7623463..943516271 100644 --- a/src/main/java/eu/siacs/conversations/services/AvatarService.java +++ b/src/main/java/de/pixart/messenger/services/AvatarService.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.services; +package de.pixart.messenger.services; import android.graphics.Bitmap; import android.graphics.Canvas; @@ -12,17 +12,17 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import eu.siacs.conversations.Config; -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.Message; -import eu.siacs.conversations.entities.MucOptions; -import eu.siacs.conversations.utils.UIHelper; -import eu.siacs.conversations.xmpp.OnAdvancedStreamFeaturesLoaded; -import eu.siacs.conversations.xmpp.XmppConnection; +import de.pixart.messenger.Config; +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.Message; +import de.pixart.messenger.entities.MucOptions; +import de.pixart.messenger.utils.UIHelper; +import de.pixart.messenger.xmpp.OnAdvancedStreamFeaturesLoaded; +import de.pixart.messenger.xmpp.XmppConnection; public class AvatarService implements OnAdvancedStreamFeaturesLoaded { diff --git a/src/main/java/eu/siacs/conversations/services/CheckAppVersionService.java b/src/main/java/de/pixart/messenger/services/CheckAppVersionService.java index 52962a314..72bc3508a 100644 --- a/src/main/java/eu/siacs/conversations/services/CheckAppVersionService.java +++ b/src/main/java/de/pixart/messenger/services/CheckAppVersionService.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.services; +package de.pixart.messenger.services; import com.google.gson.JsonObject; diff --git a/src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java b/src/main/java/de/pixart/messenger/services/ContactChooserTargetService.java index edc661b79..8fcedc095 100644 --- a/src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java +++ b/src/main/java/de/pixart/messenger/services/ContactChooserTargetService.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.services; +package de.pixart.messenger.services; import android.annotation.TargetApi; import android.content.ComponentName; @@ -16,8 +16,8 @@ import android.service.chooser.ChooserTargetService; import java.util.ArrayList; import java.util.List; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.ui.ShareWithActivity; +import de.pixart.messenger.entities.Conversation; +import de.pixart.messenger.ui.ShareWithActivity; @TargetApi(Build.VERSION_CODES.M) public class ContactChooserTargetService extends ChooserTargetService implements ServiceConnection { diff --git a/src/main/java/eu/siacs/conversations/services/EventReceiver.java b/src/main/java/de/pixart/messenger/services/EventReceiver.java index ceab1592b..3a48e5179 100644 --- a/src/main/java/eu/siacs/conversations/services/EventReceiver.java +++ b/src/main/java/de/pixart/messenger/services/EventReceiver.java @@ -1,10 +1,10 @@ -package eu.siacs.conversations.services; +package de.pixart.messenger.services; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import eu.siacs.conversations.persistance.DatabaseBackend; +import de.pixart.messenger.persistance.DatabaseBackend; public class EventReceiver extends BroadcastReceiver { @Override diff --git a/src/main/java/eu/siacs/conversations/services/ExportLogsService.java b/src/main/java/de/pixart/messenger/services/ExportLogsService.java index d5732ff2a..331321ffe 100644 --- a/src/main/java/eu/siacs/conversations/services/ExportLogsService.java +++ b/src/main/java/de/pixart/messenger/services/ExportLogsService.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.services; +package de.pixart.messenger.services; import android.app.NotificationManager; import android.app.Service; @@ -20,13 +20,13 @@ import java.util.Date; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -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.persistance.DatabaseBackend; -import eu.siacs.conversations.persistance.FileBackend; -import eu.siacs.conversations.xmpp.jid.Jid; +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.persistance.DatabaseBackend; +import de.pixart.messenger.persistance.FileBackend; +import de.pixart.messenger.xmpp.jid.Jid; public class ExportLogsService extends Service { diff --git a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java b/src/main/java/de/pixart/messenger/services/MessageArchiveService.java index 06df1b38a..fb8f4d1c4 100644 --- a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java +++ b/src/main/java/de/pixart/messenger/services/MessageArchiveService.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.services; +package de.pixart.messenger.services; import android.util.Log; import android.util.Pair; @@ -9,16 +9,16 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; -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.generator.AbstractGenerator; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.OnAdvancedStreamFeaturesLoaded; -import eu.siacs.conversations.xmpp.OnIqPacketReceived; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.stanzas.IqPacket; +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.generator.AbstractGenerator; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.OnAdvancedStreamFeaturesLoaded; +import de.pixart.messenger.xmpp.OnIqPacketReceived; +import de.pixart.messenger.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.stanzas.IqPacket; public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded { diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/de/pixart/messenger/services/NotificationService.java index 3563100c1..f0ba9d51c 100644 --- a/src/main/java/eu/siacs/conversations/services/NotificationService.java +++ b/src/main/java/de/pixart/messenger/services/NotificationService.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.services; +package de.pixart.messenger.services; import android.app.Notification; import android.app.NotificationManager; @@ -31,16 +31,16 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.entities.Message; -import eu.siacs.conversations.ui.ConversationActivity; -import eu.siacs.conversations.ui.ManageAccountActivity; -import eu.siacs.conversations.ui.TimePreference; -import eu.siacs.conversations.utils.GeoHelper; -import eu.siacs.conversations.utils.UIHelper; +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.ui.ConversationActivity; +import de.pixart.messenger.ui.ManageAccountActivity; +import de.pixart.messenger.ui.TimePreference; +import de.pixart.messenger.utils.GeoHelper; +import de.pixart.messenger.utils.UIHelper; public class NotificationService { diff --git a/src/main/java/eu/siacs/conversations/services/UpdaterWebService.java b/src/main/java/de/pixart/messenger/services/UpdaterWebService.java index 0a8d0ef69..4e4a599ad 100644 --- a/src/main/java/eu/siacs/conversations/services/UpdaterWebService.java +++ b/src/main/java/de/pixart/messenger/services/UpdaterWebService.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.services; +package de.pixart.messenger.services; import android.app.IntentService; import android.content.Intent; @@ -20,9 +20,9 @@ import org.apache.http.params.HttpParams; import java.io.ByteArrayOutputStream; import java.io.IOException; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -import eu.siacs.conversations.ui.UpdaterActivity.UpdateReceiver; +import de.pixart.messenger.Config; +import de.pixart.messenger.R; +import de.pixart.messenger.ui.UpdaterActivity.UpdateReceiver; public class UpdaterWebService extends IntentService { public static final String REQUEST_STRING = ""; diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java index 4d740c2b2..e5760598b 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.services; +package de.pixart.messenger.services; import android.annotation.SuppressLint; import android.annotation.TargetApi; @@ -60,71 +60,71 @@ import java.util.Map; import java.util.concurrent.CopyOnWriteArrayList; import de.duenndns.ssl.MemorizingTrustManager; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -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.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.DownloadableFile; -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.entities.Transferable; -import eu.siacs.conversations.entities.TransferablePlaceholder; -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.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.UiCallback; -import eu.siacs.conversations.utils.ConversationsFileObserver; -import eu.siacs.conversations.utils.CryptoHelper; -import eu.siacs.conversations.utils.ExceptionHelper; -import eu.siacs.conversations.utils.OnPhoneContactsLoadedListener; -import eu.siacs.conversations.utils.PRNGFixes; -import eu.siacs.conversations.utils.PhoneHelper; -import eu.siacs.conversations.utils.ReplacingSerialSingleThreadExecutor; -import eu.siacs.conversations.utils.SerialSingleThreadExecutor; -import eu.siacs.conversations.utils.Xmlns; -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.XmppConnection; -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.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; -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.pep.Avatar; -import eu.siacs.conversations.xmpp.stanzas.IqPacket; -import eu.siacs.conversations.xmpp.stanzas.MessagePacket; -import eu.siacs.conversations.xmpp.stanzas.PresencePacket; +import de.pixart.messenger.Config; +import de.pixart.messenger.R; +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.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.DownloadableFile; +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.entities.Transferable; +import de.pixart.messenger.entities.TransferablePlaceholder; +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.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.UiCallback; +import de.pixart.messenger.utils.ConversationsFileObserver; +import de.pixart.messenger.utils.CryptoHelper; +import de.pixart.messenger.utils.ExceptionHelper; +import de.pixart.messenger.utils.OnPhoneContactsLoadedListener; +import de.pixart.messenger.utils.PRNGFixes; +import de.pixart.messenger.utils.PhoneHelper; +import de.pixart.messenger.utils.ReplacingSerialSingleThreadExecutor; +import de.pixart.messenger.utils.SerialSingleThreadExecutor; +import de.pixart.messenger.utils.Xmlns; +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.XmppConnection; +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.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; +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.pep.Avatar; +import de.pixart.messenger.xmpp.stanzas.IqPacket; +import de.pixart.messenger.xmpp.stanzas.MessagePacket; +import de.pixart.messenger.xmpp.stanzas.PresencePacket; import me.leolin.shortcutbadger.ShortcutBadger; public class XmppConnectionService extends Service { diff --git a/src/main/java/eu/siacs/conversations/ui/AboutActivity.java b/src/main/java/de/pixart/messenger/ui/AboutActivity.java index a61b872ae..b3b296c42 100644 --- a/src/main/java/eu/siacs/conversations/ui/AboutActivity.java +++ b/src/main/java/de/pixart/messenger/ui/AboutActivity.java @@ -1,9 +1,9 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.app.Activity; import android.os.Bundle; -import eu.siacs.conversations.R; +import de.pixart.messenger.R; public class AboutActivity extends Activity { diff --git a/src/main/java/eu/siacs/conversations/ui/AboutPreference.java b/src/main/java/de/pixart/messenger/ui/AboutPreference.java index 451f0bfa6..d4cfa982b 100644 --- a/src/main/java/eu/siacs/conversations/ui/AboutPreference.java +++ b/src/main/java/de/pixart/messenger/ui/AboutPreference.java @@ -1,11 +1,11 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.content.Context; import android.content.Intent; import android.preference.Preference; import android.util.AttributeSet; -import eu.siacs.conversations.utils.PhoneHelper; +import de.pixart.messenger.utils.PhoneHelper; public class AboutPreference extends Preference { public AboutPreference(final Context context, final AttributeSet attrs, final int defStyle) { diff --git a/src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java b/src/main/java/de/pixart/messenger/ui/AbstractSearchableListItemActivity.java index 1a9fc95c2..9b12e43ef 100644 --- a/src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java +++ b/src/main/java/de/pixart/messenger/ui/AbstractSearchableListItemActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.content.Context; import android.os.Bundle; @@ -15,9 +15,9 @@ import android.widget.ListView; import java.util.ArrayList; import java.util.List; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.ListItem; -import eu.siacs.conversations.ui.adapter.ListItemAdapter; +import de.pixart.messenger.R; +import de.pixart.messenger.entities.ListItem; +import de.pixart.messenger.ui.adapter.ListItemAdapter; public abstract class AbstractSearchableListItemActivity extends XmppActivity { private ListView mListView; diff --git a/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java b/src/main/java/de/pixart/messenger/ui/BlockContactDialog.java index 9cf7e9f85..b625e8b62 100644 --- a/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java +++ b/src/main/java/de/pixart/messenger/ui/BlockContactDialog.java @@ -1,12 +1,12 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Blockable; -import eu.siacs.conversations.services.XmppConnectionService; +import de.pixart.messenger.R; +import de.pixart.messenger.entities.Blockable; +import de.pixart.messenger.services.XmppConnectionService; public final class BlockContactDialog { public static void show(final Context context, diff --git a/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java b/src/main/java/de/pixart/messenger/ui/BlocklistActivity.java index abec8ed76..cefa17de6 100644 --- a/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java +++ b/src/main/java/de/pixart/messenger/ui/BlocklistActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.os.Bundle; import android.text.Editable; @@ -7,10 +7,10 @@ import android.widget.AdapterView; import java.util.Collections; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Contact; -import eu.siacs.conversations.xmpp.OnUpdateBlocklist; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.entities.Contact; +import de.pixart.messenger.xmpp.OnUpdateBlocklist; +import de.pixart.messenger.xmpp.jid.Jid; public class BlocklistActivity extends AbstractSearchableListItemActivity implements OnUpdateBlocklist { diff --git a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java b/src/main/java/de/pixart/messenger/ui/ChangePasswordActivity.java index 31c85c19d..361caf182 100644 --- a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ChangePasswordActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.content.Intent; import android.os.Bundle; @@ -8,9 +8,9 @@ import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.services.XmppConnectionService; +import de.pixart.messenger.R; +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.services.XmppConnectionService; public class ChangePasswordActivity extends XmppActivity implements XmppConnectionService.OnAccountPasswordChanged { diff --git a/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java b/src/main/java/de/pixart/messenger/ui/ChooseContactActivity.java index 5156fcca4..e38433893 100644 --- a/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ChooseContactActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.app.ActionBar; import android.content.Context; @@ -21,12 +21,12 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -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.ListItem; -import eu.siacs.conversations.xmpp.jid.Jid; +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.ListItem; +import de.pixart.messenger.xmpp.jid.Jid; public class ChooseContactActivity extends AbstractSearchableListItemActivity { private List<String> mActivatedAccounts = new ArrayList<String>(); diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java index 623be0cfc..ef66f0c41 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.app.AlertDialog; import android.app.PendingIntent; @@ -25,19 +25,19 @@ import java.util.ArrayList; import java.util.Collections; import java.util.concurrent.atomic.AtomicInteger; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -import eu.siacs.conversations.crypto.PgpEngine; -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.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.xmpp.jid.Jid; +import de.pixart.messenger.Config; +import de.pixart.messenger.R; +import de.pixart.messenger.crypto.PgpEngine; +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.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.xmpp.jid.Jid; public class ConferenceDetailsActivity extends XmppActivity implements OnConversationUpdate, OnMucRosterUpdate, XmppConnectionService.OnAffiliationChanged, XmppConnectionService.OnRoleChanged, XmppConnectionService.OnConferenceOptionsPushed { public static final String ACTION_VIEW_MUC = "view_muc"; diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java index 7e5e72331..d1250c1d6 100644 --- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ContactDetailsActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.app.AlertDialog; import android.app.PendingIntent; @@ -34,24 +34,24 @@ import org.openintents.openpgp.util.OpenPgpUtils; import java.security.cert.X509Certificate; import java.util.List; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -import eu.siacs.conversations.crypto.PgpEngine; -import eu.siacs.conversations.crypto.axolotl.AxolotlService; -import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession; -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.utils.CryptoHelper; -import eu.siacs.conversations.utils.UIHelper; -import eu.siacs.conversations.xmpp.OnKeyStatusUpdated; -import eu.siacs.conversations.xmpp.OnUpdateBlocklist; -import eu.siacs.conversations.xmpp.XmppConnection; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.Config; +import de.pixart.messenger.R; +import de.pixart.messenger.crypto.PgpEngine; +import de.pixart.messenger.crypto.axolotl.AxolotlService; +import de.pixart.messenger.crypto.axolotl.XmppAxolotlSession; +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.utils.CryptoHelper; +import de.pixart.messenger.utils.UIHelper; +import de.pixart.messenger.xmpp.OnKeyStatusUpdated; +import de.pixart.messenger.xmpp.OnUpdateBlocklist; +import de.pixart.messenger.xmpp.XmppConnection; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; public class ContactDetailsActivity extends XmppActivity implements OnAccountUpdate, OnRosterUpdate, OnUpdateBlocklist, OnKeyStatusUpdated { public static final String ACTION_VIEW_CONTACT = "view_contact"; diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java index 20e4bd852..141941c6b 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.Manifest; import android.annotation.SuppressLint; @@ -56,30 +56,30 @@ import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import de.timroes.android.listview.EnhancedListView; -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.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.Message; -import eu.siacs.conversations.entities.Presence; -import eu.siacs.conversations.entities.Transferable; -import eu.siacs.conversations.persistance.FileBackend; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.services.XmppConnectionService.OnAccountUpdate; -import eu.siacs.conversations.services.XmppConnectionService.OnConversationUpdate; -import eu.siacs.conversations.services.XmppConnectionService.OnRosterUpdate; -import eu.siacs.conversations.ui.adapter.ConversationAdapter; -import eu.siacs.conversations.utils.ExceptionHelper; -import eu.siacs.conversations.utils.FileUtils; -import eu.siacs.conversations.utils.UIHelper; -import eu.siacs.conversations.xmpp.OnUpdateBlocklist; -import eu.siacs.conversations.xmpp.chatstate.ChatState; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +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.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.Message; +import de.pixart.messenger.entities.Presence; +import de.pixart.messenger.entities.Transferable; +import de.pixart.messenger.persistance.FileBackend; +import de.pixart.messenger.services.XmppConnectionService; +import de.pixart.messenger.services.XmppConnectionService.OnAccountUpdate; +import de.pixart.messenger.services.XmppConnectionService.OnConversationUpdate; +import de.pixart.messenger.services.XmppConnectionService.OnRosterUpdate; +import de.pixart.messenger.ui.adapter.ConversationAdapter; +import de.pixart.messenger.utils.ExceptionHelper; +import de.pixart.messenger.utils.FileUtils; +import de.pixart.messenger.utils.UIHelper; +import de.pixart.messenger.xmpp.OnUpdateBlocklist; +import de.pixart.messenger.xmpp.chatstate.ChatState; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; public class ConversationActivity extends XmppActivity implements OnAccountUpdate, OnConversationUpdate, OnRosterUpdate, OnUpdateBlocklist, XmppConnectionService.OnShowErrorToast, View.OnClickListener { diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index 81418314c..1ffa52c3f 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.app.Activity; import android.app.AlertDialog; @@ -41,31 +41,31 @@ import java.util.Collections; import java.util.List; import java.util.UUID; -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.DownloadableFile; -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.entities.TransferablePlaceholder; -import eu.siacs.conversations.http.HttpDownloadConnection; -import eu.siacs.conversations.services.MessageArchiveService; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.ui.XmppActivity.OnPresenceSelected; -import eu.siacs.conversations.ui.XmppActivity.OnValueEdited; -import eu.siacs.conversations.ui.adapter.MessageAdapter; -import eu.siacs.conversations.ui.adapter.MessageAdapter.OnContactPictureClicked; -import eu.siacs.conversations.ui.adapter.MessageAdapter.OnContactPictureLongClicked; -import eu.siacs.conversations.utils.GeoHelper; -import eu.siacs.conversations.utils.UIHelper; -import eu.siacs.conversations.xmpp.XmppConnection; -import eu.siacs.conversations.xmpp.chatstate.ChatState; -import eu.siacs.conversations.xmpp.jid.Jid; +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.DownloadableFile; +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.entities.TransferablePlaceholder; +import de.pixart.messenger.http.HttpDownloadConnection; +import de.pixart.messenger.services.MessageArchiveService; +import de.pixart.messenger.services.XmppConnectionService; +import de.pixart.messenger.ui.XmppActivity.OnPresenceSelected; +import de.pixart.messenger.ui.XmppActivity.OnValueEdited; +import de.pixart.messenger.ui.adapter.MessageAdapter; +import de.pixart.messenger.ui.adapter.MessageAdapter.OnContactPictureClicked; +import de.pixart.messenger.ui.adapter.MessageAdapter.OnContactPictureLongClicked; +import de.pixart.messenger.utils.GeoHelper; +import de.pixart.messenger.utils.UIHelper; +import de.pixart.messenger.xmpp.XmppConnection; +import de.pixart.messenger.xmpp.chatstate.ChatState; +import de.pixart.messenger.xmpp.jid.Jid; public class ConversationFragment extends Fragment implements EditMessage.KeyboardListener { diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java index 0640f0075..330e3e59a 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/main/java/de/pixart/messenger/ui/EditAccountActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.app.AlertDialog; import android.app.AlertDialog.Builder; @@ -39,24 +39,24 @@ import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -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.services.XmppConnectionService.OnAccountUpdate; -import eu.siacs.conversations.services.XmppConnectionService.OnCaptchaRequested; -import eu.siacs.conversations.ui.adapter.KnownHostsAdapter; -import eu.siacs.conversations.utils.CryptoHelper; -import eu.siacs.conversations.utils.UIHelper; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.OnKeyStatusUpdated; -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.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.pep.Avatar; +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.services.XmppConnectionService.OnAccountUpdate; +import de.pixart.messenger.services.XmppConnectionService.OnCaptchaRequested; +import de.pixart.messenger.ui.adapter.KnownHostsAdapter; +import de.pixart.messenger.utils.CryptoHelper; +import de.pixart.messenger.utils.UIHelper; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.OnKeyStatusUpdated; +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.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.pep.Avatar; public class EditAccountActivity extends XmppActivity implements OnAccountUpdate, OnKeyStatusUpdated, OnCaptchaRequested, KeyChainAliasCallback, XmppConnectionService.OnShowErrorToast, XmppConnectionService.OnMamPreferencesFetched { diff --git a/src/main/java/eu/siacs/conversations/ui/EditMessage.java b/src/main/java/de/pixart/messenger/ui/EditMessage.java index e3841d1d5..ee08cd47e 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditMessage.java +++ b/src/main/java/de/pixart/messenger/ui/EditMessage.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.content.Context; import android.os.Handler; @@ -6,7 +6,7 @@ import android.util.AttributeSet; import android.view.KeyEvent; import android.widget.EditText; -import eu.siacs.conversations.Config; +import de.pixart.messenger.Config; public class EditMessage extends EditText { diff --git a/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java b/src/main/java/de/pixart/messenger/ui/EnterJidDialog.java index f77d9c0a8..086594951 100644 --- a/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java +++ b/src/main/java/de/pixart/messenger/ui/EnterJidDialog.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.app.AlertDialog; import android.content.Context; @@ -11,11 +11,11 @@ import android.widget.TextView; import java.util.List; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -import eu.siacs.conversations.ui.adapter.KnownHostsAdapter; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.Config; +import de.pixart.messenger.R; +import de.pixart.messenger.ui.adapter.KnownHostsAdapter; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; public class EnterJidDialog { public interface OnEnterJidDialogPositiveListener { diff --git a/src/main/java/eu/siacs/conversations/ui/ExportLogsPreference.java b/src/main/java/de/pixart/messenger/ui/ExportLogsPreference.java index bedb4172d..e7c57a033 100644 --- a/src/main/java/eu/siacs/conversations/ui/ExportLogsPreference.java +++ b/src/main/java/de/pixart/messenger/ui/ExportLogsPreference.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.Manifest; import android.content.Context; @@ -8,7 +8,7 @@ import android.os.Build; import android.preference.Preference; import android.util.AttributeSet; -import eu.siacs.conversations.services.ExportLogsService; +import de.pixart.messenger.services.ExportLogsService; public class ExportLogsPreference extends Preference { diff --git a/src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java b/src/main/java/de/pixart/messenger/ui/MagicCreateActivity.java index 1b16e565d..6927c9732 100644 --- a/src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java +++ b/src/main/java/de/pixart/messenger/ui/MagicCreateActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.content.Intent; import android.os.Bundle; @@ -12,11 +12,11 @@ import android.widget.Toast; import java.security.SecureRandom; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.Config; +import de.pixart.messenger.R; +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; public class MagicCreateActivity extends XmppActivity implements TextWatcher { diff --git a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/main/java/de/pixart/messenger/ui/ManageAccountActivity.java index 48af85947..81e553bd5 100644 --- a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ManageAccountActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.app.ActionBar; import android.app.AlertDialog; @@ -27,14 +27,14 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -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.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +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.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; public class ManageAccountActivity extends XmppActivity implements OnAccountUpdate, KeyChainAliasCallback, XmppConnectionService.OnAccountCreated { diff --git a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java b/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java index 19c1c1f68..187317f86 100644 --- a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java +++ b/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java @@ -1,5 +1,5 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.app.PendingIntent; import android.content.Intent; @@ -21,13 +21,13 @@ import com.soundcloud.android.crop.Crop; import java.io.File; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.persistance.FileBackend; -import eu.siacs.conversations.utils.FileUtils; -import eu.siacs.conversations.utils.PhoneHelper; -import eu.siacs.conversations.xmpp.pep.Avatar; +import de.pixart.messenger.Config; +import de.pixart.messenger.R; +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.persistance.FileBackend; +import de.pixart.messenger.utils.FileUtils; +import de.pixart.messenger.utils.PhoneHelper; +import de.pixart.messenger.xmpp.pep.Avatar; public class PublishProfilePictureActivity extends XmppActivity { diff --git a/src/main/java/eu/siacs/conversations/ui/RecordingActivity.java b/src/main/java/de/pixart/messenger/ui/RecordingActivity.java index daa715397..a9ebccb8c 100644 --- a/src/main/java/eu/siacs/conversations/ui/RecordingActivity.java +++ b/src/main/java/de/pixart/messenger/ui/RecordingActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.app.Activity; import android.content.Intent; @@ -6,7 +6,6 @@ import android.media.MediaRecorder; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.os.Environment; import android.os.Handler; import android.os.SystemClock; import android.util.Log; @@ -21,9 +20,9 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -import eu.siacs.conversations.persistance.FileBackend; +import de.pixart.messenger.Config; +import de.pixart.messenger.R; +import de.pixart.messenger.persistance.FileBackend; public class RecordingActivity extends Activity implements View.OnClickListener { diff --git a/src/main/java/eu/siacs/conversations/ui/SetPresenceActivity.java b/src/main/java/de/pixart/messenger/ui/SetPresenceActivity.java index ca1fb8f7c..7214e560b 100644 --- a/src/main/java/eu/siacs/conversations/ui/SetPresenceActivity.java +++ b/src/main/java/de/pixart/messenger/ui/SetPresenceActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.content.Intent; import android.os.Bundle; @@ -20,12 +20,12 @@ import android.widget.TextView; import java.util.List; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.ListItem; -import eu.siacs.conversations.entities.Presence; -import eu.siacs.conversations.entities.PresenceTemplate; -import eu.siacs.conversations.utils.UIHelper; +import de.pixart.messenger.R; +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.entities.ListItem; +import de.pixart.messenger.entities.Presence; +import de.pixart.messenger.entities.PresenceTemplate; +import de.pixart.messenger.utils.UIHelper; public class SetPresenceActivity extends XmppActivity implements View.OnClickListener { diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java index 0972c103c..150a1d779 100644 --- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.app.AlertDialog; import android.app.FragmentManager; @@ -24,11 +24,11 @@ import java.util.List; import java.util.Locale; import de.duenndns.ssl.MemorizingTrustManager; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.services.ExportLogsService; -import eu.siacs.conversations.xmpp.XmppConnection; +import de.pixart.messenger.Config; +import de.pixart.messenger.R; +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.services.ExportLogsService; +import de.pixart.messenger.xmpp.XmppConnection; public class SettingsActivity extends XmppActivity implements OnSharedPreferenceChangeListener { diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsFragment.java b/src/main/java/de/pixart/messenger/ui/SettingsFragment.java index e4185abc8..c9e6dc51a 100644 --- a/src/main/java/eu/siacs/conversations/ui/SettingsFragment.java +++ b/src/main/java/de/pixart/messenger/ui/SettingsFragment.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.app.Dialog; import android.os.Bundle; @@ -11,7 +11,7 @@ import android.view.ViewParent; import android.widget.FrameLayout; import android.widget.LinearLayout; -import eu.siacs.conversations.R; +import de.pixart.messenger.R; public class SettingsFragment extends PreferenceFragment { diff --git a/src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java b/src/main/java/de/pixart/messenger/ui/ShareLocationActivity.java index d2818d28a..5e059386c 100644 --- a/src/main/java/eu/siacs/conversations/ui/ShareLocationActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ShareLocationActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.annotation.TargetApi; import android.app.Activity; @@ -33,8 +33,8 @@ import java.io.IOException; import java.util.List; import java.util.Locale; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; +import de.pixart.messenger.Config; +import de.pixart.messenger.R; public class ShareLocationActivity extends Activity implements OnMapReadyCallback, GoogleApiClient.ConnectionCallbacks, diff --git a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java index 9a7414efb..d0a840af8 100644 --- a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ShareWithActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.app.PendingIntent; import android.content.Intent; @@ -19,17 +19,17 @@ import java.util.Iterator; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -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.persistance.FileBackend; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.ui.adapter.ConversationAdapter; -import eu.siacs.conversations.xmpp.XmppConnection; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +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.persistance.FileBackend; +import de.pixart.messenger.services.XmppConnectionService; +import de.pixart.messenger.ui.adapter.ConversationAdapter; +import de.pixart.messenger.xmpp.XmppConnection; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; public class ShareWithActivity extends XmppActivity implements XmppConnectionService.OnConversationUpdate { diff --git a/src/main/java/eu/siacs/conversations/ui/ShowFullscreenMessageActivity.java b/src/main/java/de/pixart/messenger/ui/ShowFullscreenMessageActivity.java index dddb8ab80..8d2df66f6 100644 --- a/src/main/java/eu/siacs/conversations/ui/ShowFullscreenMessageActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ShowFullscreenMessageActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.app.Activity; import android.content.Intent; @@ -23,7 +23,7 @@ import com.github.rtoshiro.view.video.FullscreenVideoLayout; import java.io.File; import java.io.IOException; -import eu.siacs.conversations.R; +import de.pixart.messenger.R; import uk.co.senab.photoview.PhotoView; import uk.co.senab.photoview.PhotoViewAttacher; diff --git a/src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java b/src/main/java/de/pixart/messenger/ui/ShowLocationActivity.java index a25d2b19c..4b13fd515 100644 --- a/src/main/java/eu/siacs/conversations/ui/ShowLocationActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ShowLocationActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.Manifest; import android.app.ActionBar; @@ -24,8 +24,8 @@ import com.google.android.gms.maps.model.MarkerOptions; import java.util.List; import java.util.Locale; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; +import de.pixart.messenger.Config; +import de.pixart.messenger.R; public class ShowLocationActivity extends Activity implements OnMapReadyCallback { diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java index 67c97dd1f..931a2dbae 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.Manifest; import android.annotation.SuppressLint; @@ -58,23 +58,23 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -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.ListItem; -import eu.siacs.conversations.entities.Presence; -import eu.siacs.conversations.services.XmppConnectionService.OnRosterUpdate; -import eu.siacs.conversations.ui.adapter.KnownHostsAdapter; -import eu.siacs.conversations.ui.adapter.ListItemAdapter; -import eu.siacs.conversations.utils.XmppUri; -import eu.siacs.conversations.xmpp.OnUpdateBlocklist; -import eu.siacs.conversations.xmpp.XmppConnection; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.Config; +import de.pixart.messenger.R; +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.ListItem; +import de.pixart.messenger.entities.Presence; +import de.pixart.messenger.services.XmppConnectionService.OnRosterUpdate; +import de.pixart.messenger.ui.adapter.KnownHostsAdapter; +import de.pixart.messenger.ui.adapter.ListItemAdapter; +import de.pixart.messenger.utils.XmppUri; +import de.pixart.messenger.xmpp.OnUpdateBlocklist; +import de.pixart.messenger.xmpp.XmppConnection; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; public class StartConversationActivity extends XmppActivity implements OnRosterUpdate, OnUpdateBlocklist { diff --git a/src/main/java/eu/siacs/conversations/ui/startUI.java b/src/main/java/de/pixart/messenger/ui/StartUI.java index e33e75401..5c9e4c324 100644 --- a/src/main/java/eu/siacs/conversations/ui/startUI.java +++ b/src/main/java/de/pixart/messenger/ui/StartUI.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.Manifest; import android.content.Context; @@ -15,8 +15,8 @@ import android.util.Log; import java.util.List; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; +import de.pixart.messenger.Config; +import de.pixart.messenger.R; import pub.devrel.easypermissions.AfterPermissionGranted; import pub.devrel.easypermissions.EasyPermissions; diff --git a/src/main/java/eu/siacs/conversations/ui/TimePreference.java b/src/main/java/de/pixart/messenger/ui/TimePreference.java index e32b068c7..1c8c8c0f1 100644 --- a/src/main/java/eu/siacs/conversations/ui/TimePreference.java +++ b/src/main/java/de/pixart/messenger/ui/TimePreference.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.content.Context; import android.content.res.TypedArray; diff --git a/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java index cc4ba7b23..5b274d102 100644 --- a/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java +++ b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.content.Intent; import android.os.Bundle; @@ -18,14 +18,14 @@ import java.util.List; import java.util.Map; import java.util.Set; -import eu.siacs.conversations.R; -import eu.siacs.conversations.crypto.axolotl.AxolotlService; -import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.xmpp.OnKeyStatusUpdated; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.R; +import de.pixart.messenger.crypto.axolotl.AxolotlService; +import de.pixart.messenger.crypto.axolotl.XmppAxolotlSession; +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.entities.Conversation; +import de.pixart.messenger.xmpp.OnKeyStatusUpdated; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; public class TrustKeysActivity extends XmppActivity implements OnKeyStatusUpdated { private List<Jid> contactJids; diff --git a/src/main/java/eu/siacs/conversations/ui/UiCallback.java b/src/main/java/de/pixart/messenger/ui/UiCallback.java index d056d6289..07377c879 100644 --- a/src/main/java/eu/siacs/conversations/ui/UiCallback.java +++ b/src/main/java/de/pixart/messenger/ui/UiCallback.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.app.PendingIntent; diff --git a/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java b/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java index 70536d5f5..0a35288d7 100644 --- a/src/main/java/eu/siacs/conversations/ui/UpdaterActivity.java +++ b/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.Manifest; import android.app.Activity; @@ -32,10 +32,10 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -import eu.siacs.conversations.persistance.DatabaseBackend; -import eu.siacs.conversations.services.UpdaterWebService; +import de.pixart.messenger.Config; +import de.pixart.messenger.R; +import de.pixart.messenger.persistance.DatabaseBackend; +import de.pixart.messenger.services.UpdaterWebService; public class UpdaterActivity extends Activity { diff --git a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java b/src/main/java/de/pixart/messenger/ui/VerifyOTRActivity.java index d8d02c123..9ef4ca171 100644 --- a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java +++ b/src/main/java/de/pixart/messenger/ui/VerifyOTRActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.app.ActionBar; import android.app.AlertDialog; @@ -19,15 +19,15 @@ import com.google.zxing.integration.android.IntentResult; import net.java.otr4j.OtrException; import net.java.otr4j.session.Session; -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 eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +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 de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; public class VerifyOTRActivity extends XmppActivity implements XmppConnectionService.OnConversationUpdate { diff --git a/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java b/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java index 464e57401..c92bb8cd4 100644 --- a/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java +++ b/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.Manifest; import android.app.Activity; @@ -26,9 +26,9 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.List; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -import eu.siacs.conversations.persistance.DatabaseBackend; +import de.pixart.messenger.Config; +import de.pixart.messenger.R; +import de.pixart.messenger.persistance.DatabaseBackend; public class WelcomeActivity extends Activity { diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java index 7736bc7be..8f6192d04 100644 --- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.pixart.messenger.ui; import android.Manifest; import android.annotation.SuppressLint; @@ -27,7 +27,6 @@ import android.graphics.Color; import android.graphics.Point; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import android.media.MediaMetadataRetriever; import android.net.Uri; import android.nfc.NdefMessage; import android.nfc.NdefRecord; @@ -70,25 +69,25 @@ import java.util.Hashtable; import java.util.List; import java.util.concurrent.RejectedExecutionException; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession; -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.Presences; -import eu.siacs.conversations.services.AvatarService; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.services.XmppConnectionService.XmppConnectionBinder; -import eu.siacs.conversations.ui.widget.Switch; -import eu.siacs.conversations.utils.CryptoHelper; -import eu.siacs.conversations.utils.ExceptionHelper; -import eu.siacs.conversations.xmpp.OnKeyStatusUpdated; -import eu.siacs.conversations.xmpp.OnUpdateBlocklist; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.Config; +import de.pixart.messenger.R; +import de.pixart.messenger.crypto.axolotl.XmppAxolotlSession; +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.Presences; +import de.pixart.messenger.services.AvatarService; +import de.pixart.messenger.services.XmppConnectionService; +import de.pixart.messenger.services.XmppConnectionService.XmppConnectionBinder; +import de.pixart.messenger.ui.widget.Switch; +import de.pixart.messenger.utils.CryptoHelper; +import de.pixart.messenger.utils.ExceptionHelper; +import de.pixart.messenger.xmpp.OnKeyStatusUpdated; +import de.pixart.messenger.xmpp.OnUpdateBlocklist; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; public abstract class XmppActivity extends Activity { diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java index 393e3d100..812c41ace 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/AccountAdapter.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui.adapter; +package de.pixart.messenger.ui.adapter; import android.content.Context; import android.view.LayoutInflater; @@ -10,10 +10,10 @@ import android.widget.TextView; import java.util.List; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.ui.XmppActivity; +import de.pixart.messenger.Config; +import de.pixart.messenger.R; +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.ui.XmppActivity; public class AccountAdapter extends ArrayAdapter<Account> { diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java index 36cc4ae5e..f19dfa43b 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui.adapter; +package de.pixart.messenger.ui.adapter; import android.content.Context; import android.content.res.Resources; @@ -19,13 +19,13 @@ import java.lang.ref.WeakReference; import java.util.List; import java.util.concurrent.RejectedExecutionException; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.entities.Message; -import eu.siacs.conversations.ui.ConversationActivity; -import eu.siacs.conversations.ui.XmppActivity; -import eu.siacs.conversations.utils.UIHelper; -import eu.siacs.conversations.xmpp.chatstate.ChatState; +import de.pixart.messenger.R; +import de.pixart.messenger.entities.Conversation; +import de.pixart.messenger.entities.Message; +import de.pixart.messenger.ui.ConversationActivity; +import de.pixart.messenger.ui.XmppActivity; +import de.pixart.messenger.utils.UIHelper; +import de.pixart.messenger.xmpp.chatstate.ChatState; public class ConversationAdapter extends ArrayAdapter<Conversation> { diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/KnownHostsAdapter.java index 39bfc082e..2906f16ba 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/KnownHostsAdapter.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui.adapter; +package de.pixart.messenger.ui.adapter; import android.content.Context; import android.widget.ArrayAdapter; diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java index bc2263ba9..f338f7170 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui.adapter; +package de.pixart.messenger.ui.adapter; import android.content.Context; import android.content.SharedPreferences; @@ -20,10 +20,10 @@ import java.lang.ref.WeakReference; import java.util.List; import java.util.concurrent.RejectedExecutionException; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.ListItem; -import eu.siacs.conversations.ui.XmppActivity; -import eu.siacs.conversations.utils.UIHelper; +import de.pixart.messenger.R; +import de.pixart.messenger.entities.ListItem; +import de.pixart.messenger.ui.XmppActivity; +import de.pixart.messenger.utils.UIHelper; public class ListItemAdapter extends ArrayAdapter<ListItem> { diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java index e34712615..0480ca2b4 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui.adapter; +package de.pixart.messenger.ui.adapter; import android.content.ActivityNotFoundException; import android.content.Context; @@ -43,20 +43,20 @@ import java.util.regex.MatchResult; import java.util.regex.Matcher; import java.util.regex.Pattern; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession; -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.Message.FileParams; -import eu.siacs.conversations.entities.Transferable; -import eu.siacs.conversations.ui.ConversationActivity; -import eu.siacs.conversations.ui.ShowFullscreenMessageActivity; -import eu.siacs.conversations.utils.CryptoHelper; -import eu.siacs.conversations.utils.GeoHelper; -import eu.siacs.conversations.utils.UIHelper; +import de.pixart.messenger.Config; +import de.pixart.messenger.R; +import de.pixart.messenger.crypto.axolotl.XmppAxolotlSession; +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.Message.FileParams; +import de.pixart.messenger.entities.Transferable; +import de.pixart.messenger.ui.ConversationActivity; +import de.pixart.messenger.ui.ShowFullscreenMessageActivity; +import de.pixart.messenger.utils.CryptoHelper; +import de.pixart.messenger.utils.GeoHelper; +import de.pixart.messenger.utils.UIHelper; import nl.changer.audiowife.AudioWife; public class MessageAdapter extends ArrayAdapter<Message> { diff --git a/src/main/java/eu/siacs/conversations/ui/forms/FormBooleanFieldWrapper.java b/src/main/java/de/pixart/messenger/ui/forms/FormBooleanFieldWrapper.java index 6cb357a90..2593ac204 100644 --- a/src/main/java/eu/siacs/conversations/ui/forms/FormBooleanFieldWrapper.java +++ b/src/main/java/de/pixart/messenger/ui/forms/FormBooleanFieldWrapper.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui.forms; +package de.pixart.messenger.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 eu.siacs.conversations.R; -import eu.siacs.conversations.xmpp.forms.Field; +import de.pixart.messenger.R; +import de.pixart.messenger.xmpp.forms.Field; public class FormBooleanFieldWrapper extends FormFieldWrapper { diff --git a/src/main/java/eu/siacs/conversations/ui/forms/FormFieldFactory.java b/src/main/java/de/pixart/messenger/ui/forms/FormFieldFactory.java index ee3064726..c1318b9f1 100644 --- a/src/main/java/eu/siacs/conversations/ui/forms/FormFieldFactory.java +++ b/src/main/java/de/pixart/messenger/ui/forms/FormFieldFactory.java @@ -1,10 +1,10 @@ -package eu.siacs.conversations.ui.forms; +package de.pixart.messenger.ui.forms; import android.content.Context; import java.util.Hashtable; -import eu.siacs.conversations.xmpp.forms.Field; +import de.pixart.messenger.xmpp.forms.Field; diff --git a/src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java b/src/main/java/de/pixart/messenger/ui/forms/FormFieldWrapper.java index 3b051191b..5182f3e7a 100644 --- a/src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java +++ b/src/main/java/de/pixart/messenger/ui/forms/FormFieldWrapper.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui.forms; +package de.pixart.messenger.ui.forms; import android.content.Context; import android.text.SpannableString; @@ -9,8 +9,8 @@ import android.view.View; import java.util.List; -import eu.siacs.conversations.R; -import eu.siacs.conversations.xmpp.forms.Field; +import de.pixart.messenger.R; +import de.pixart.messenger.xmpp.forms.Field; public abstract class FormFieldWrapper { diff --git a/src/main/java/eu/siacs/conversations/ui/forms/FormJidSingleFieldWrapper.java b/src/main/java/de/pixart/messenger/ui/forms/FormJidSingleFieldWrapper.java index 553e8f21f..8d37f259f 100644 --- a/src/main/java/eu/siacs/conversations/ui/forms/FormJidSingleFieldWrapper.java +++ b/src/main/java/de/pixart/messenger/ui/forms/FormJidSingleFieldWrapper.java @@ -1,14 +1,14 @@ -package eu.siacs.conversations.ui.forms; +package de.pixart.messenger.ui.forms; import android.content.Context; import android.text.InputType; import java.util.List; -import eu.siacs.conversations.R; -import eu.siacs.conversations.xmpp.forms.Field; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.R; +import de.pixart.messenger.xmpp.forms.Field; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; public class FormJidSingleFieldWrapper extends FormTextFieldWrapper { diff --git a/src/main/java/eu/siacs/conversations/ui/forms/FormTextFieldWrapper.java b/src/main/java/de/pixart/messenger/ui/forms/FormTextFieldWrapper.java index b7dac9510..cccfd1608 100644 --- a/src/main/java/eu/siacs/conversations/ui/forms/FormTextFieldWrapper.java +++ b/src/main/java/de/pixart/messenger/ui/forms/FormTextFieldWrapper.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui.forms; +package de.pixart.messenger.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 eu.siacs.conversations.R; -import eu.siacs.conversations.xmpp.forms.Field; +import de.pixart.messenger.R; +import de.pixart.messenger.xmpp.forms.Field; public class FormTextFieldWrapper extends FormFieldWrapper { diff --git a/src/main/java/eu/siacs/conversations/ui/forms/FormWrapper.java b/src/main/java/de/pixart/messenger/ui/forms/FormWrapper.java index eafe95cc8..05fa922b5 100644 --- a/src/main/java/eu/siacs/conversations/ui/forms/FormWrapper.java +++ b/src/main/java/de/pixart/messenger/ui/forms/FormWrapper.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui.forms; +package de.pixart.messenger.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 eu.siacs.conversations.xmpp.forms.Data; -import eu.siacs.conversations.xmpp.forms.Field; +import de.pixart.messenger.xmpp.forms.Data; +import de.pixart.messenger.xmpp.forms.Field; public class FormWrapper { diff --git a/src/main/java/eu/siacs/conversations/ui/widget/Switch.java b/src/main/java/de/pixart/messenger/ui/widget/Switch.java index fd3b5553f..2bd4eda3d 100644 --- a/src/main/java/eu/siacs/conversations/ui/widget/Switch.java +++ b/src/main/java/de/pixart/messenger/ui/widget/Switch.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui.widget; +package de.pixart.messenger.ui.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/src/main/java/eu/siacs/conversations/utils/ConversationsFileObserver.java b/src/main/java/de/pixart/messenger/utils/ConversationsFileObserver.java index e6993bfe5..44cdc5100 100644 --- a/src/main/java/eu/siacs/conversations/utils/ConversationsFileObserver.java +++ b/src/main/java/de/pixart/messenger/utils/ConversationsFileObserver.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.pixart.messenger.utils; import android.os.FileObserver; diff --git a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java b/src/main/java/de/pixart/messenger/utils/CryptoHelper.java index 253584bf1..d043e08b1 100644 --- a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java +++ b/src/main/java/de/pixart/messenger/utils/CryptoHelper.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.pixart.messenger.utils; import android.os.Bundle; import android.util.Pair; @@ -22,11 +22,11 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Locale; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Message; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.Config; +import de.pixart.messenger.R; +import de.pixart.messenger.entities.Message; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; public final class CryptoHelper { public static final String FILETRANSFER = "?FILETRANSFERv1:"; diff --git a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java b/src/main/java/de/pixart/messenger/utils/DNSHelper.java index b51a9f16a..c6bfbf930 100644 --- a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java +++ b/src/main/java/de/pixart/messenger/utils/DNSHelper.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.pixart.messenger.utils; import android.annotation.TargetApi; import android.content.Context; @@ -34,8 +34,8 @@ import de.measite.minidns.record.AAAA; import de.measite.minidns.record.Data; import de.measite.minidns.record.SRV; import de.measite.minidns.util.NameUtil; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.Config; +import de.pixart.messenger.xmpp.jid.Jid; public class DNSHelper { diff --git a/src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java b/src/main/java/de/pixart/messenger/utils/ExceptionHandler.java index b8a0fa511..40648dc04 100644 --- a/src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java +++ b/src/main/java/de/pixart/messenger/utils/ExceptionHandler.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.pixart.messenger.utils; import android.content.Context; diff --git a/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java b/src/main/java/de/pixart/messenger/utils/ExceptionHelper.java index 79c547889..b405f24d4 100644 --- a/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java +++ b/src/main/java/de/pixart/messenger/utils/ExceptionHelper.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.pixart.messenger.utils; import android.app.AlertDialog; import android.content.Context; @@ -20,15 +20,15 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; -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.ConversationActivity; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +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.ConversationActivity; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; public class ExceptionHelper { private static SimpleDateFormat DATE_FORMATs = new SimpleDateFormat("yyyy-MM-dd"); diff --git a/src/main/java/eu/siacs/conversations/utils/ExifHelper.java b/src/main/java/de/pixart/messenger/utils/ExifHelper.java index ceda72933..0ac4d6e4d 100644 --- a/src/main/java/eu/siacs/conversations/utils/ExifHelper.java +++ b/src/main/java/de/pixart/messenger/utils/ExifHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.siacs.conversations.utils; +package de.pixart.messenger.utils; import android.util.Log; diff --git a/src/main/java/eu/siacs/conversations/utils/FileUtils.java b/src/main/java/de/pixart/messenger/utils/FileUtils.java index 6e75d41cd..fa69de49b 100644 --- a/src/main/java/eu/siacs/conversations/utils/FileUtils.java +++ b/src/main/java/de/pixart/messenger/utils/FileUtils.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.pixart.messenger.utils; import android.annotation.SuppressLint; import android.content.ContentUris; diff --git a/src/main/java/eu/siacs/conversations/utils/GeoHelper.java b/src/main/java/de/pixart/messenger/utils/GeoHelper.java index 171e7dba6..e8204e12d 100644 --- a/src/main/java/eu/siacs/conversations/utils/GeoHelper.java +++ b/src/main/java/de/pixart/messenger/utils/GeoHelper.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.pixart.messenger.utils; import android.content.Intent; import android.net.Uri; @@ -9,9 +9,9 @@ import java.util.ArrayList; import java.util.regex.Matcher; import java.util.regex.Pattern; -import eu.siacs.conversations.entities.Contact; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.entities.Message; +import de.pixart.messenger.entities.Contact; +import de.pixart.messenger.entities.Conversation; +import de.pixart.messenger.entities.Message; public class GeoHelper { public static Pattern GEO_URI = Pattern.compile("geo:([\\-0-9.]+),([\\-0-9.]+)(?:,([\\-0-9.]+))?(?:\\?(.*))?", Pattern.CASE_INSENSITIVE); diff --git a/src/main/java/eu/siacs/conversations/utils/MimeUtils.java b/src/main/java/de/pixart/messenger/utils/MimeUtils.java index d45444240..f90822c2e 100644 --- a/src/main/java/eu/siacs/conversations/utils/MimeUtils.java +++ b/src/main/java/de/pixart/messenger/utils/MimeUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package eu.siacs.conversations.utils; +package de.pixart.messenger.utils; import java.io.File; import java.io.FileInputStream; import java.io.IOException; diff --git a/src/main/java/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java b/src/main/java/de/pixart/messenger/utils/OnPhoneContactsLoadedListener.java index f18a4ed8e..049154745 100644 --- a/src/main/java/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java +++ b/src/main/java/de/pixart/messenger/utils/OnPhoneContactsLoadedListener.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.pixart.messenger.utils; import android.os.Bundle; diff --git a/src/main/java/eu/siacs/conversations/utils/PRNGFixes.java b/src/main/java/de/pixart/messenger/utils/PRNGFixes.java index 8fe67234e..be456a30c 100644 --- a/src/main/java/eu/siacs/conversations/utils/PRNGFixes.java +++ b/src/main/java/de/pixart/messenger/utils/PRNGFixes.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.pixart.messenger.utils; import android.os.Build; import android.os.Process; diff --git a/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java b/src/main/java/de/pixart/messenger/utils/PhoneHelper.java index e77b2bae3..7c19961b9 100644 --- a/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java +++ b/src/main/java/de/pixart/messenger/utils/PhoneHelper.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.pixart.messenger.utils; import android.Manifest; import android.content.Context; diff --git a/src/main/java/eu/siacs/conversations/utils/ReplacingSerialSingleThreadExecutor.java b/src/main/java/de/pixart/messenger/utils/ReplacingSerialSingleThreadExecutor.java index dc8a0a825..bad93072d 100644 --- a/src/main/java/eu/siacs/conversations/utils/ReplacingSerialSingleThreadExecutor.java +++ b/src/main/java/de/pixart/messenger/utils/ReplacingSerialSingleThreadExecutor.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.pixart.messenger.utils; public class ReplacingSerialSingleThreadExecutor extends SerialSingleThreadExecutor { diff --git a/src/main/java/eu/siacs/conversations/utils/SSLSocketHelper.java b/src/main/java/de/pixart/messenger/utils/SSLSocketHelper.java index 3a8c1c0aa..661fda807 100644 --- a/src/main/java/eu/siacs/conversations/utils/SSLSocketHelper.java +++ b/src/main/java/de/pixart/messenger/utils/SSLSocketHelper.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.pixart.messenger.utils; import android.os.Build; diff --git a/src/main/java/eu/siacs/conversations/utils/SerialSingleThreadExecutor.java b/src/main/java/de/pixart/messenger/utils/SerialSingleThreadExecutor.java index 55489ee30..116149ec1 100644 --- a/src/main/java/eu/siacs/conversations/utils/SerialSingleThreadExecutor.java +++ b/src/main/java/de/pixart/messenger/utils/SerialSingleThreadExecutor.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.pixart.messenger.utils; import android.os.Looper; diff --git a/src/main/java/eu/siacs/conversations/utils/SocksSocketFactory.java b/src/main/java/de/pixart/messenger/utils/SocksSocketFactory.java index 768e9f17b..ee7be8e9c 100644 --- a/src/main/java/eu/siacs/conversations/utils/SocksSocketFactory.java +++ b/src/main/java/de/pixart/messenger/utils/SocksSocketFactory.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.pixart.messenger.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 eu.siacs.conversations.Config; +import de.pixart.messenger.Config; public class SocksSocketFactory { diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/de/pixart/messenger/utils/UIHelper.java index acc7f28c5..53c1b8a11 100644 --- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java +++ b/src/main/java/de/pixart/messenger/utils/UIHelper.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.pixart.messenger.utils; import android.content.Context; import android.text.format.DateFormat; @@ -11,14 +11,14 @@ import java.util.Calendar; import java.util.Date; import java.util.Locale; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Contact; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.entities.ListItem; -import eu.siacs.conversations.entities.Message; -import eu.siacs.conversations.entities.Presence; -import eu.siacs.conversations.entities.Transferable; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.R; +import de.pixart.messenger.entities.Contact; +import de.pixart.messenger.entities.Conversation; +import de.pixart.messenger.entities.ListItem; +import de.pixart.messenger.entities.Message; +import de.pixart.messenger.entities.Presence; +import de.pixart.messenger.entities.Transferable; +import de.pixart.messenger.xmpp.jid.Jid; public class UIHelper { diff --git a/src/main/java/eu/siacs/conversations/utils/XmlHelper.java b/src/main/java/de/pixart/messenger/utils/XmlHelper.java index 9e062f0da..29729f9d1 100644 --- a/src/main/java/eu/siacs/conversations/utils/XmlHelper.java +++ b/src/main/java/de/pixart/messenger/utils/XmlHelper.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.pixart.messenger.utils; public class XmlHelper { public static String encodeEntities(String content) { diff --git a/src/main/java/eu/siacs/conversations/utils/Xmlns.java b/src/main/java/de/pixart/messenger/utils/Xmlns.java index de0a29ce2..cdae3a819 100644 --- a/src/main/java/eu/siacs/conversations/utils/Xmlns.java +++ b/src/main/java/de/pixart/messenger/utils/Xmlns.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.pixart.messenger.utils; public final class Xmlns { public static final String BLOCKING = "urn:xmpp:blocking"; diff --git a/src/main/java/eu/siacs/conversations/utils/XmppUri.java b/src/main/java/de/pixart/messenger/utils/XmppUri.java index 4039f8b0a..07f85503e 100644 --- a/src/main/java/eu/siacs/conversations/utils/XmppUri.java +++ b/src/main/java/de/pixart/messenger/utils/XmppUri.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.pixart.messenger.utils; import android.net.Uri; @@ -6,8 +6,8 @@ import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.util.List; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; public class XmppUri { diff --git a/src/main/java/eu/siacs/conversations/xml/Element.java b/src/main/java/de/pixart/messenger/xml/Element.java index 34794be1b..ca8cdf0a7 100644 --- a/src/main/java/eu/siacs/conversations/xml/Element.java +++ b/src/main/java/de/pixart/messenger/xml/Element.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xml; +package de.pixart.messenger.xml; import android.util.Log; @@ -6,10 +6,10 @@ import java.util.ArrayList; import java.util.Hashtable; import java.util.List; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.utils.XmlHelper; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.Config; +import de.pixart.messenger.utils.XmlHelper; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; public class Element { private final String name; diff --git a/src/main/java/eu/siacs/conversations/xml/Tag.java b/src/main/java/de/pixart/messenger/xml/Tag.java index b9ef979ff..b604140f0 100644 --- a/src/main/java/eu/siacs/conversations/xml/Tag.java +++ b/src/main/java/de/pixart/messenger/xml/Tag.java @@ -1,11 +1,11 @@ -package eu.siacs.conversations.xml; +package de.pixart.messenger.xml; import java.util.Hashtable; import java.util.Iterator; import java.util.Map.Entry; import java.util.Set; -import eu.siacs.conversations.utils.XmlHelper; +import de.pixart.messenger.utils.XmlHelper; public class Tag { public static final int NO = -1; diff --git a/src/main/java/eu/siacs/conversations/xml/TagWriter.java b/src/main/java/de/pixart/messenger/xml/TagWriter.java index 9d16c338c..61220773a 100644 --- a/src/main/java/eu/siacs/conversations/xml/TagWriter.java +++ b/src/main/java/de/pixart/messenger/xml/TagWriter.java @@ -1,11 +1,11 @@ -package eu.siacs.conversations.xml; +package de.pixart.messenger.xml; import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.util.concurrent.LinkedBlockingQueue; -import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; +import de.pixart.messenger.xmpp.stanzas.AbstractStanza; public class TagWriter { diff --git a/src/main/java/eu/siacs/conversations/xml/XmlReader.java b/src/main/java/de/pixart/messenger/xml/XmlReader.java index 48569086b..8c2781caf 100644 --- a/src/main/java/eu/siacs/conversations/xml/XmlReader.java +++ b/src/main/java/de/pixart/messenger/xml/XmlReader.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xml; +package de.pixart.messenger.xml; import android.os.PowerManager; import android.os.PowerManager.WakeLock; @@ -12,7 +12,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import eu.siacs.conversations.Config; +import de.pixart.messenger.Config; public class XmlReader { private XmlPullParser parser; diff --git a/src/main/java/eu/siacs/conversations/xmpp/OnAdvancedStreamFeaturesLoaded.java b/src/main/java/de/pixart/messenger/xmpp/OnAdvancedStreamFeaturesLoaded.java index e45eba73e..572b61bc1 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/OnAdvancedStreamFeaturesLoaded.java +++ b/src/main/java/de/pixart/messenger/xmpp/OnAdvancedStreamFeaturesLoaded.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp; +package de.pixart.messenger.xmpp; -import eu.siacs.conversations.entities.Account; +import de.pixart.messenger.entities.Account; public interface OnAdvancedStreamFeaturesLoaded { public void onAdvancedStreamFeaturesAvailable(final Account account); diff --git a/src/main/java/de/pixart/messenger/xmpp/OnBindListener.java b/src/main/java/de/pixart/messenger/xmpp/OnBindListener.java new file mode 100644 index 000000000..cafc3fadb --- /dev/null +++ b/src/main/java/de/pixart/messenger/xmpp/OnBindListener.java @@ -0,0 +1,7 @@ +package de.pixart.messenger.xmpp; + +import de.pixart.messenger.entities.Account; + +public interface OnBindListener { + public void onBind(Account account); +} diff --git a/src/main/java/eu/siacs/conversations/xmpp/OnContactStatusChanged.java b/src/main/java/de/pixart/messenger/xmpp/OnContactStatusChanged.java index 20b17f021..be1c51b72 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/OnContactStatusChanged.java +++ b/src/main/java/de/pixart/messenger/xmpp/OnContactStatusChanged.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp; +package de.pixart.messenger.xmpp; -import eu.siacs.conversations.entities.Contact; +import de.pixart.messenger.entities.Contact; public interface OnContactStatusChanged { public void onContactStatusChanged(final Contact contact, final boolean online); diff --git a/src/main/java/de/pixart/messenger/xmpp/OnIqPacketReceived.java b/src/main/java/de/pixart/messenger/xmpp/OnIqPacketReceived.java new file mode 100644 index 000000000..b07b6258e --- /dev/null +++ b/src/main/java/de/pixart/messenger/xmpp/OnIqPacketReceived.java @@ -0,0 +1,8 @@ +package de.pixart.messenger.xmpp; + +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.xmpp.stanzas.IqPacket; + +public interface OnIqPacketReceived extends PacketReceived { + public void onIqPacketReceived(Account account, IqPacket packet); +} diff --git a/src/main/java/eu/siacs/conversations/xmpp/OnKeyStatusUpdated.java b/src/main/java/de/pixart/messenger/xmpp/OnKeyStatusUpdated.java index e7fc582e4..3727d37d7 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/OnKeyStatusUpdated.java +++ b/src/main/java/de/pixart/messenger/xmpp/OnKeyStatusUpdated.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp; +package de.pixart.messenger.xmpp; -import eu.siacs.conversations.crypto.axolotl.AxolotlService; +import de.pixart.messenger.crypto.axolotl.AxolotlService; public interface OnKeyStatusUpdated { public void onKeyStatusUpdated(AxolotlService.FetchStatus report); diff --git a/src/main/java/eu/siacs/conversations/xmpp/OnMessageAcknowledged.java b/src/main/java/de/pixart/messenger/xmpp/OnMessageAcknowledged.java index 5f670d933..3ab3bd75a 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/OnMessageAcknowledged.java +++ b/src/main/java/de/pixart/messenger/xmpp/OnMessageAcknowledged.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp; +package de.pixart.messenger.xmpp; -import eu.siacs.conversations.entities.Account; +import de.pixart.messenger.entities.Account; public interface OnMessageAcknowledged { public void onMessageAcknowledged(Account account, String id); diff --git a/src/main/java/eu/siacs/conversations/xmpp/OnMessagePacketReceived.java b/src/main/java/de/pixart/messenger/xmpp/OnMessagePacketReceived.java index 325e945f0..9a0f3bb2b 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/OnMessagePacketReceived.java +++ b/src/main/java/de/pixart/messenger/xmpp/OnMessagePacketReceived.java @@ -1,7 +1,7 @@ -package eu.siacs.conversations.xmpp; +package de.pixart.messenger.xmpp; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.xmpp.stanzas.MessagePacket; +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.xmpp.stanzas.MessagePacket; public interface OnMessagePacketReceived extends PacketReceived { public void onMessagePacketReceived(Account account, MessagePacket packet); diff --git a/src/main/java/eu/siacs/conversations/xmpp/OnNewKeysAvailable.java b/src/main/java/de/pixart/messenger/xmpp/OnNewKeysAvailable.java index e69de29bb..e69de29bb 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/OnNewKeysAvailable.java +++ b/src/main/java/de/pixart/messenger/xmpp/OnNewKeysAvailable.java diff --git a/src/main/java/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java b/src/main/java/de/pixart/messenger/xmpp/OnPresencePacketReceived.java index 95c1acfcc..5419443a2 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java +++ b/src/main/java/de/pixart/messenger/xmpp/OnPresencePacketReceived.java @@ -1,7 +1,7 @@ -package eu.siacs.conversations.xmpp; +package de.pixart.messenger.xmpp; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.xmpp.stanzas.PresencePacket; +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.xmpp.stanzas.PresencePacket; public interface OnPresencePacketReceived extends PacketReceived { public void onPresencePacketReceived(Account account, PresencePacket packet); diff --git a/src/main/java/eu/siacs/conversations/xmpp/OnStatusChanged.java b/src/main/java/de/pixart/messenger/xmpp/OnStatusChanged.java index ad1d98cb9..7f1e07b9c 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/OnStatusChanged.java +++ b/src/main/java/de/pixart/messenger/xmpp/OnStatusChanged.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp; +package de.pixart.messenger.xmpp; -import eu.siacs.conversations.entities.Account; +import de.pixart.messenger.entities.Account; public interface OnStatusChanged { public void onStatusChanged(Account account); diff --git a/src/main/java/eu/siacs/conversations/xmpp/OnUpdateBlocklist.java b/src/main/java/de/pixart/messenger/xmpp/OnUpdateBlocklist.java index 92e72cfa8..4b8d90ec7 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/OnUpdateBlocklist.java +++ b/src/main/java/de/pixart/messenger/xmpp/OnUpdateBlocklist.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp; +package de.pixart.messenger.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/eu/siacs/conversations/xmpp/PacketReceived.java b/src/main/java/de/pixart/messenger/xmpp/PacketReceived.java index d4502d734..b5b02b147 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/PacketReceived.java +++ b/src/main/java/de/pixart/messenger/xmpp/PacketReceived.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp; +package de.pixart.messenger.xmpp; public abstract interface PacketReceived { diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java index fec96969b..d8d4b9725 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java +++ b/src/main/java/de/pixart/messenger/xmpp/XmppConnection.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp; +package de.pixart.messenger.xmpp; import android.graphics.Bitmap; import android.graphics.BitmapFactory; @@ -53,43 +53,43 @@ import javax.net.ssl.X509KeyManager; import javax.net.ssl.X509TrustManager; import de.duenndns.ssl.MemorizingTrustManager; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.crypto.XmppDomainVerifier; -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.entities.Account; -import eu.siacs.conversations.entities.Message; -import eu.siacs.conversations.entities.ServiceDiscoveryResult; -import eu.siacs.conversations.generator.IqGenerator; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.utils.DNSHelper; -import eu.siacs.conversations.utils.SSLSocketHelper; -import eu.siacs.conversations.utils.SocksSocketFactory; -import eu.siacs.conversations.utils.Xmlns; -import eu.siacs.conversations.xml.Element; -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.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; -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 de.pixart.messenger.Config; +import de.pixart.messenger.crypto.XmppDomainVerifier; +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.entities.Account; +import de.pixart.messenger.entities.Message; +import de.pixart.messenger.entities.ServiceDiscoveryResult; +import de.pixart.messenger.generator.IqGenerator; +import de.pixart.messenger.services.XmppConnectionService; +import de.pixart.messenger.utils.DNSHelper; +import de.pixart.messenger.utils.SSLSocketHelper; +import de.pixart.messenger.utils.SocksSocketFactory; +import de.pixart.messenger.utils.Xmlns; +import de.pixart.messenger.xml.Element; +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.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; +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; public class XmppConnection implements Runnable { diff --git a/src/main/java/eu/siacs/conversations/xmpp/chatstate/ChatState.java b/src/main/java/de/pixart/messenger/xmpp/chatstate/ChatState.java index 3e371562c..c3117455c 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/chatstate/ChatState.java +++ b/src/main/java/de/pixart/messenger/xmpp/chatstate/ChatState.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.chatstate; +package de.pixart.messenger.xmpp.chatstate; -import eu.siacs.conversations.xml.Element; +import de.pixart.messenger.xml.Element; public enum ChatState { diff --git a/src/main/java/eu/siacs/conversations/xmpp/forms/Data.java b/src/main/java/de/pixart/messenger/xmpp/forms/Data.java index c81c5a1f3..8ae70f9c7 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/forms/Data.java +++ b/src/main/java/de/pixart/messenger/xmpp/forms/Data.java @@ -1,11 +1,11 @@ -package eu.siacs.conversations.xmpp.forms; +package de.pixart.messenger.xmpp.forms; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; -import eu.siacs.conversations.xml.Element; +import de.pixart.messenger.xml.Element; public class Data extends Element { diff --git a/src/main/java/eu/siacs/conversations/xmpp/forms/Field.java b/src/main/java/de/pixart/messenger/xmpp/forms/Field.java index 020b34b90..4cf5fc6b7 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/forms/Field.java +++ b/src/main/java/de/pixart/messenger/xmpp/forms/Field.java @@ -1,11 +1,11 @@ -package eu.siacs.conversations.xmpp.forms; +package de.pixart.messenger.xmpp.forms; import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; -import eu.siacs.conversations.xml.Element; +import de.pixart.messenger.xml.Element; public class Field extends Element { diff --git a/src/main/java/eu/siacs/conversations/xmpp/jid/InvalidJidException.java b/src/main/java/de/pixart/messenger/xmpp/jid/InvalidJidException.java index 164e88495..9f091063a 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jid/InvalidJidException.java +++ b/src/main/java/de/pixart/messenger/xmpp/jid/InvalidJidException.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp.jid; +package de.pixart.messenger.xmpp.jid; public class InvalidJidException extends Exception { diff --git a/src/main/java/eu/siacs/conversations/xmpp/jid/Jid.java b/src/main/java/de/pixart/messenger/xmpp/jid/Jid.java index a15abe14a..2f5451364 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jid/Jid.java +++ b/src/main/java/de/pixart/messenger/xmpp/jid/Jid.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp.jid; +package de.pixart.messenger.xmpp.jid; import android.util.LruCache; @@ -6,7 +6,7 @@ import net.java.otr4j.session.SessionID; import java.net.IDN; -import eu.siacs.conversations.Config; +import de.pixart.messenger.Config; import gnu.inet.encoding.Stringprep; import gnu.inet.encoding.StringprepException; diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleCandidate.java index dcadb92f1..166fa6c69 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleCandidate.java @@ -1,10 +1,10 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.pixart.messenger.xmpp.jingle; import java.util.ArrayList; import java.util.List; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.jid.Jid; public class JingleCandidate { diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java index 86c445279..29c5acfb8 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.pixart.messenger.xmpp.jingle; import android.util.Log; import android.util.Pair; @@ -15,28 +15,28 @@ import java.util.Locale; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.crypto.axolotl.AxolotlService; -import eu.siacs.conversations.crypto.axolotl.OnMessageCreatedCallback; -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.persistance.FileBackend; -import eu.siacs.conversations.services.AbstractConnectionManager; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.OnIqPacketReceived; -import eu.siacs.conversations.xmpp.jid.Jid; -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 de.pixart.messenger.Config; +import de.pixart.messenger.crypto.axolotl.AxolotlService; +import de.pixart.messenger.crypto.axolotl.OnMessageCreatedCallback; +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.persistance.FileBackend; +import de.pixart.messenger.services.AbstractConnectionManager; +import de.pixart.messenger.services.XmppConnectionService; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.OnIqPacketReceived; +import de.pixart.messenger.xmpp.jid.Jid; +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; public class JingleConnection implements Transferable { private final SimpleDateFormat fileDateFormat = new SimpleDateFormat("yyyyMMdd_HHmmssSSS", Locale.US); diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnectionManager.java index 0f0361cd3..b8f96bded 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnectionManager.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.pixart.messenger.xmpp.jingle; import android.annotation.SuppressLint; import android.util.Log; @@ -9,18 +9,18 @@ import java.util.HashMap; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -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.Xmlns; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.OnIqPacketReceived; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.jingle.stanzas.JinglePacket; -import eu.siacs.conversations.xmpp.stanzas.IqPacket; +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.Xmlns; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.OnIqPacketReceived; +import de.pixart.messenger.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.jingle.stanzas.JinglePacket; +import de.pixart.messenger.xmpp.stanzas.IqPacket; public class JingleConnectionManager extends AbstractConnectionManager { private List<JingleConnection> connections = new CopyOnWriteArrayList<>(); diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleInbandTransport.java index 0b0cb4083..e8b7d45d8 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleInbandTransport.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.pixart.messenger.xmpp.jingle; import android.util.Base64; import android.util.Log; @@ -10,15 +10,15 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -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.utils.CryptoHelper; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.OnIqPacketReceived; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.stanzas.IqPacket; +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.utils.CryptoHelper; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.OnIqPacketReceived; +import de.pixart.messenger.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.stanzas.IqPacket; public class JingleInbandTransport extends JingleTransport { diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleSocks5Transport.java index 140f20b91..4f3e78394 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleSocks5Transport.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.pixart.messenger.xmpp.jingle; import android.os.PowerManager; import android.util.Log; @@ -12,12 +12,12 @@ import java.net.SocketAddress; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.entities.DownloadableFile; -import eu.siacs.conversations.persistance.FileBackend; -import eu.siacs.conversations.utils.CryptoHelper; -import eu.siacs.conversations.utils.SocksSocketFactory; -import eu.siacs.conversations.xmpp.jingle.stanzas.Content; +import de.pixart.messenger.Config; +import de.pixart.messenger.entities.DownloadableFile; +import de.pixart.messenger.persistance.FileBackend; +import de.pixart.messenger.utils.CryptoHelper; +import de.pixart.messenger.utils.SocksSocketFactory; +import de.pixart.messenger.xmpp.jingle.stanzas.Content; public class JingleSocks5Transport extends JingleTransport { private JingleCandidate candidate; diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleTransport.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleTransport.java index e832d3f58..1ee97b415 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleTransport.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleTransport.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.pixart.messenger.xmpp.jingle; -import eu.siacs.conversations.entities.DownloadableFile; +import de.pixart.messenger.entities.DownloadableFile; public abstract class JingleTransport { public abstract void connect(final OnTransportConnected callback); diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java b/src/main/java/de/pixart/messenger/xmpp/jingle/OnFileTransmissionStatusChanged.java index 91cba39f5..6bbf7111a 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/OnFileTransmissionStatusChanged.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.pixart.messenger.xmpp.jingle; -import eu.siacs.conversations.entities.DownloadableFile; +import de.pixart.messenger.entities.DownloadableFile; public interface OnFileTransmissionStatusChanged { void onFileTransmitted(DownloadableFile file); diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/OnJinglePacketReceived.java b/src/main/java/de/pixart/messenger/xmpp/jingle/OnJinglePacketReceived.java new file mode 100644 index 000000000..82dfefa5e --- /dev/null +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/OnJinglePacketReceived.java @@ -0,0 +1,9 @@ +package de.pixart.messenger.xmpp.jingle; + +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.xmpp.PacketReceived; +import de.pixart.messenger.xmpp.jingle.stanzas.JinglePacket; + +public interface OnJinglePacketReceived extends PacketReceived { + void onJinglePacketReceived(Account account, JinglePacket packet); +} diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java b/src/main/java/de/pixart/messenger/xmpp/jingle/OnPrimaryCandidateFound.java index 76e337177..fad7bb4d4 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/OnPrimaryCandidateFound.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.pixart.messenger.xmpp.jingle; public interface OnPrimaryCandidateFound { void onPrimaryCandidateFound(boolean success, JingleCandidate canditate); diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java b/src/main/java/de/pixart/messenger/xmpp/jingle/OnTransportConnected.java index 38f03c5d0..10efd76d7 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/OnTransportConnected.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.pixart.messenger.xmpp.jingle; public interface OnTransportConnected { public void failed(); diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Content.java index 49f52bf33..bef32926f 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Content.java @@ -1,7 +1,7 @@ -package eu.siacs.conversations.xmpp.jingle.stanzas; +package de.pixart.messenger.xmpp.jingle.stanzas; -import eu.siacs.conversations.entities.DownloadableFile; -import eu.siacs.conversations.xml.Element; +import de.pixart.messenger.entities.DownloadableFile; +import de.pixart.messenger.xml.Element; public class Content extends Element { diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/JinglePacket.java index 4f73a83a7..971ab8e1b 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/JinglePacket.java @@ -1,8 +1,8 @@ -package eu.siacs.conversations.xmpp.jingle.stanzas; +package de.pixart.messenger.xmpp.jingle.stanzas; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.stanzas.IqPacket; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.stanzas.IqPacket; public class JinglePacket extends IqPacket { Content content = null; diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Reason.java index 610d5e760..3c77a91a6 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Reason.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.jingle.stanzas; +package de.pixart.messenger.xmpp.jingle.stanzas; -import eu.siacs.conversations.xml.Element; +import de.pixart.messenger.xml.Element; public class Reason extends Element { private Reason(String name) { diff --git a/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java b/src/main/java/de/pixart/messenger/xmpp/pep/Avatar.java index 38bb5c8f9..1f28cd92d 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java +++ b/src/main/java/de/pixart/messenger/xmpp/pep/Avatar.java @@ -1,9 +1,9 @@ -package eu.siacs.conversations.xmpp.pep; +package de.pixart.messenger.xmpp.pep; import android.util.Base64; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.jid.Jid; public class Avatar { diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractAcknowledgeableStanza.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractAcknowledgeableStanza.java index fa5e6fbdd..615c4dfbe 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractAcknowledgeableStanza.java +++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractAcknowledgeableStanza.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.stanzas; +package de.pixart.messenger.xmpp.stanzas; -import eu.siacs.conversations.xml.Element; +import de.pixart.messenger.xml.Element; abstract public class AbstractAcknowledgeableStanza extends AbstractStanza { diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractStanza.java index a6144df28..a21d8b56d 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java +++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/AbstractStanza.java @@ -1,8 +1,8 @@ -package eu.siacs.conversations.xmpp.stanzas; +package de.pixart.messenger.xmpp.stanzas; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.jid.Jid; public class AbstractStanza extends Element { diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/IqPacket.java index 302dc78e8..b0a22c314 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java +++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/IqPacket.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.stanzas; +package de.pixart.messenger.xmpp.stanzas; -import eu.siacs.conversations.xml.Element; +import de.pixart.messenger.xml.Element; public class IqPacket extends AbstractAcknowledgeableStanza { diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/MessagePacket.java index ac75a5e59..5af2d701b 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java +++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/MessagePacket.java @@ -1,9 +1,9 @@ -package eu.siacs.conversations.xmpp.stanzas; +package de.pixart.messenger.xmpp.stanzas; import android.util.Pair; -import eu.siacs.conversations.parser.AbstractParser; -import eu.siacs.conversations.xml.Element; +import de.pixart.messenger.parser.AbstractParser; +import de.pixart.messenger.xml.Element; public class MessagePacket extends AbstractAcknowledgeableStanza { public static final int TYPE_CHAT = 0; diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/PresencePacket.java index c321498d8..6c816cac3 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java +++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/PresencePacket.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp.stanzas; +package de.pixart.messenger.xmpp.stanzas; public class PresencePacket extends AbstractAcknowledgeableStanza { diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/csi/ActivePacket.java index 78ab66d8f..10abb3499 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java +++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/csi/ActivePacket.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.stanzas.csi; +package de.pixart.messenger.xmpp.stanzas.csi; -import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; +import de.pixart.messenger.xmpp.stanzas.AbstractStanza; public class ActivePacket extends AbstractStanza { public ActivePacket() { diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/csi/InactivePacket.java index f109280f1..ebaad8205 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java +++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/csi/InactivePacket.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.stanzas.csi; +package de.pixart.messenger.xmpp.stanzas.csi; -import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; +import de.pixart.messenger.xmpp.stanzas.AbstractStanza; public class InactivePacket extends AbstractStanza { public InactivePacket() { diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/AckPacket.java index f93b5d870..5c8131878 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java +++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/AckPacket.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.stanzas.streammgmt; +package de.pixart.messenger.xmpp.stanzas.streammgmt; -import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; +import de.pixart.messenger.xmpp.stanzas.AbstractStanza; public class AckPacket extends AbstractStanza { diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/EnablePacket.java index 78cd81edc..2beca0f20 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java +++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/EnablePacket.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.stanzas.streammgmt; +package de.pixart.messenger.xmpp.stanzas.streammgmt; -import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; +import de.pixart.messenger.xmpp.stanzas.AbstractStanza; public class EnablePacket extends AbstractStanza { diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/RequestPacket.java index 98cfc748b..19880f3c6 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java +++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/RequestPacket.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.stanzas.streammgmt; +package de.pixart.messenger.xmpp.stanzas.streammgmt; -import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; +import de.pixart.messenger.xmpp.stanzas.AbstractStanza; public class RequestPacket extends AbstractStanza { diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java b/src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/ResumePacket.java index 9cdcfa5ec..1c7f8d08c 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java +++ b/src/main/java/de/pixart/messenger/xmpp/stanzas/streammgmt/ResumePacket.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.stanzas.streammgmt; +package de.pixart.messenger.xmpp.stanzas.streammgmt; -import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; +import de.pixart.messenger.xmpp.stanzas.AbstractStanza; public class ResumePacket extends AbstractStanza { diff --git a/src/main/java/eu/siacs/conversations/xmpp/OnBindListener.java b/src/main/java/eu/siacs/conversations/xmpp/OnBindListener.java deleted file mode 100644 index f09cf33dd..000000000 --- a/src/main/java/eu/siacs/conversations/xmpp/OnBindListener.java +++ /dev/null @@ -1,7 +0,0 @@ -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/eu/siacs/conversations/xmpp/OnIqPacketReceived.java b/src/main/java/eu/siacs/conversations/xmpp/OnIqPacketReceived.java deleted file mode 100644 index a4cff9863..000000000 --- a/src/main/java/eu/siacs/conversations/xmpp/OnIqPacketReceived.java +++ /dev/null @@ -1,8 +0,0 @@ -package eu.siacs.conversations.xmpp; - -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.xmpp.stanzas.IqPacket; - -public interface OnIqPacketReceived extends PacketReceived { - public void onIqPacketReceived(Account account, IqPacket packet); -} diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnJinglePacketReceived.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/OnJinglePacketReceived.java deleted file mode 100644 index 9a60b3924..000000000 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnJinglePacketReceived.java +++ /dev/null @@ -1,9 +0,0 @@ -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); -} |