diff options
Diffstat (limited to '')
-rw-r--r-- | build.gradle | 6 | ||||
-rw-r--r-- | manifest-merger-release-report.txt | 32 | ||||
-rw-r--r-- | src/main/AndroidManifest.xml | 38 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/Config.java (renamed from src/main/java/eu/siacs/conversations/Config.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/crypto/OtrService.java (renamed from src/main/java/eu/siacs/conversations/crypto/OtrService.java) | 20 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/crypto/PgpEngine.java (renamed from src/main/java/eu/siacs/conversations/crypto/PgpEngine.java) | 20 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/crypto/sasl/DigestMd5.java (renamed from src/main/java/eu/siacs/conversations/crypto/sasl/DigestMd5.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/crypto/sasl/Plain.java (renamed from src/main/java/eu/siacs/conversations/crypto/sasl/Plain.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/crypto/sasl/SaslMechanism.java (renamed from src/main/java/eu/siacs/conversations/crypto/sasl/SaslMechanism.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/crypto/sasl/ScramSha1.java (renamed from src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/crypto/sasl/Tokenizer.java (renamed from src/main/java/eu/siacs/conversations/crypto/sasl/Tokenizer.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/AbstractEntity.java (renamed from src/main/java/eu/siacs/conversations/entities/AbstractEntity.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/Account.java (renamed from src/main/java/eu/siacs/conversations/entities/Account.java) | 16 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/Blockable.java (renamed from src/main/java/eu/siacs/conversations/entities/Blockable.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/Bookmark.java (renamed from src/main/java/eu/siacs/conversations/entities/Bookmark.java) | 10 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/Contact.java (renamed from src/main/java/eu/siacs/conversations/entities/Contact.java) | 12 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java (renamed from src/main/java/eu/siacs/conversations/entities/Conversation.java) | 10 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java (renamed from src/main/java/eu/siacs/conversations/entities/DownloadableFile.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/ListItem.java (renamed from src/main/java/eu/siacs/conversations/entities/ListItem.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/Message.java (renamed from src/main/java/eu/siacs/conversations/entities/Message.java) | 14 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/MucOptions.java (renamed from src/main/java/eu/siacs/conversations/entities/MucOptions.java) | 14 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/Presences.java (renamed from src/main/java/eu/siacs/conversations/entities/Presences.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/Roster.java (renamed from src/main/java/eu/siacs/conversations/entities/Roster.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/Transferable.java (renamed from src/main/java/eu/siacs/conversations/entities/Transferable.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/TransferablePlaceholder.java (renamed from src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/generator/AbstractGenerator.java (renamed from src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/generator/IqGenerator.java (renamed from src/main/java/eu/siacs/conversations/generator/IqGenerator.java) | 26 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/generator/MessageGenerator.java (renamed from src/main/java/eu/siacs/conversations/generator/MessageGenerator.java) | 18 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/generator/PresenceGenerator.java (renamed from src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java) | 12 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java (renamed from src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java) | 10 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java (renamed from src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java) | 16 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java (renamed from src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java) | 30 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/parser/AbstractParser.java (renamed from src/main/java/eu/siacs/conversations/parser/AbstractParser.java) | 16 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/parser/IqParser.java (renamed from src/main/java/eu/siacs/conversations/parser/IqParser.java) | 22 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java (renamed from src/main/java/eu/siacs/conversations/parser/MessageParser.java) | 34 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/parser/PresenceParser.java (renamed from src/main/java/eu/siacs/conversations/parser/PresenceParser.java) | 28 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/persistance/DatabaseBackend.java (renamed from src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java) | 18 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java (renamed from src/main/java/eu/siacs/conversations/persistance/FileBackend.java) | 20 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/persistance/OnPhoneContactsMerged.java (renamed from src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/services/AbstractConnectionManager.java (renamed from src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java (renamed from src/main/java/eu/siacs/conversations/services/AvatarService.java) | 16 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/services/EventReceiver.java (renamed from src/main/java/eu/siacs/conversations/services/EventReceiver.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/services/MessageArchiveService.java (renamed from src/main/java/eu/siacs/conversations/services/MessageArchiveService.java) | 22 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java (renamed from src/main/java/eu/siacs/conversations/services/NotificationService.java) | 22 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java (renamed from src/main/java/eu/siacs/conversations/services/XmppConnectionService.java) | 106 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/AboutActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/AboutActivity.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/AboutPreference.java (renamed from src/main/java/eu/siacs/conversations/ui/AboutPreference.java) | 7 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/AbstractSearchableListItemActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/BlockContactDialog.java (renamed from src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/BlocklistActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java) | 10 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/ChangePasswordActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java) | 13 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/ChooseContactActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java) | 10 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/ConferenceDetailsActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java) | 29 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/ContactDetailsActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java) | 28 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/ConversationActivity.java) | 38 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java (renamed from src/main/java/eu/siacs/conversations/ui/ConversationFragment.java) | 46 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/EditAccountActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java) | 22 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/EditMessage.java (renamed from src/main/java/eu/siacs/conversations/ui/EditMessage.java) | 5 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/ManageAccountActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java) | 10 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/PublishProfilePictureActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java) | 14 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/SettingsActivity.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/SettingsFragment.java (renamed from src/main/java/eu/siacs/conversations/ui/SettingsFragment.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java) | 18 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java) | 36 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/TimePreference.java (renamed from src/main/java/eu/siacs/conversations/ui/TimePreference.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/UiCallback.java (renamed from src/main/java/eu/siacs/conversations/ui/UiCallback.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/VerifyOTRActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java) | 20 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java (renamed from src/main/java/eu/siacs/conversations/ui/XmppActivity.java) | 34 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/adapter/AccountAdapter.java (renamed from src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java) | 10 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java (renamed from src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java) | 35 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/adapter/KnownHostsAdapter.java (renamed from src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java (renamed from src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java) | 12 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java (renamed from src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java) | 27 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/utils/CryptoHelper.java (renamed from src/main/java/eu/siacs/conversations/utils/CryptoHelper.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/utils/DNSHelper.java (renamed from src/main/java/eu/siacs/conversations/utils/DNSHelper.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHandler.java (renamed from src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHelper.java (renamed from src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java) | 18 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/utils/ExifHelper.java (renamed from src/main/java/eu/siacs/conversations/utils/ExifHelper.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/utils/GeoHelper.java (renamed from src/main/java/eu/siacs/conversations/utils/GeoHelper.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/utils/MimeUtils.java (renamed from src/main/java/eu/siacs/conversations/utils/MimeUtils.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/utils/OnPhoneContactsLoadedListener.java (renamed from src/main/java/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/utils/PRNGFixes.java (renamed from src/main/java/eu/siacs/conversations/utils/PRNGFixes.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/utils/PhoneHelper.java (renamed from src/main/java/eu/siacs/conversations/utils/PhoneHelper.java) | 3 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/utils/SerialSingleThreadExecutor.java (renamed from src/main/java/eu/siacs/conversations/utils/SerialSingleThreadExecutor.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java (renamed from src/main/java/eu/siacs/conversations/utils/UIHelper.java) | 20 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/utils/XmlHelper.java (renamed from src/main/java/eu/siacs/conversations/utils/XmlHelper.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/utils/Xmlns.java (renamed from src/main/java/eu/siacs/conversations/utils/Xmlns.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/utils/XmppUri.java (renamed from src/main/java/eu/siacs/conversations/utils/XmppUri.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xml/Element.java (renamed from src/main/java/eu/siacs/conversations/xml/Element.java) | 10 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xml/Tag.java (renamed from src/main/java/eu/siacs/conversations/xml/Tag.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xml/TagWriter.java (renamed from src/main/java/eu/siacs/conversations/xml/TagWriter.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xml/XmlReader.java (renamed from src/main/java/eu/siacs/conversations/xml/XmlReader.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/OnAdvancedStreamFeaturesLoaded.java (renamed from src/main/java/eu/siacs/conversations/xmpp/OnAdvancedStreamFeaturesLoaded.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/OnBindListener.java | 7 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/OnContactStatusChanged.java (renamed from src/main/java/eu/siacs/conversations/xmpp/OnContactStatusChanged.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/OnIqPacketReceived.java | 8 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/OnMessageAcknowledged.java (renamed from src/main/java/eu/siacs/conversations/xmpp/OnMessageAcknowledged.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/OnMessagePacketReceived.java | 8 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/OnPresencePacketReceived.java | 8 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/OnStatusChanged.java | 7 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/OnUpdateBlocklist.java (renamed from src/main/java/eu/siacs/conversations/xmpp/OnUpdateBlocklist.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/PacketReceived.java (renamed from src/main/java/eu/siacs/conversations/xmpp/PacketReceived.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/XmppConnection.java (renamed from src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java) | 60 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/chatstate/ChatState.java (renamed from src/main/java/eu/siacs/conversations/xmpp/chatstate/ChatState.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/forms/Data.java (renamed from src/main/java/eu/siacs/conversations/xmpp/forms/Data.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/forms/Field.java (renamed from src/main/java/eu/siacs/conversations/xmpp/forms/Field.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/jid/InvalidJidException.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jid/InvalidJidException.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/jid/Jid.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jid/Jid.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleCandidate.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java) | 32 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java) | 27 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleInbandTransport.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java) | 20 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java) | 10 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleTransport.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/JingleTransport.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/OnFileTransmissionStatusChanged.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/OnJinglePacketReceived.java | 9 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/OnPrimaryCandidateFound.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/OnTransportConnected.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/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/thedevstack/conversationsplus/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/thedevstack/conversationsplus/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/thedevstack/conversationsplus/xmpp/pep/Avatar.java (renamed from src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/AbstractStanza.java (renamed from src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/IqPacket.java (renamed from src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/MessagePacket.java (renamed from src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/PresencePacket.java (renamed from src/main/java/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/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/thedevstack/conversationsplus/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/thedevstack/conversationsplus/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/thedevstack/conversationsplus/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/thedevstack/conversationsplus/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/thedevstack/conversationsplus/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/OnMessagePacketReceived.java | 8 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java | 8 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/OnStatusChanged.java | 7 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/jingle/OnJinglePacketReceived.java | 9 | ||||
-rw-r--r-- | src/main/res/layout/activity_about.xml | 2 | ||||
-rw-r--r-- | src/main/res/layout/fragment_conversation.xml | 4 | ||||
-rw-r--r-- | src/main/res/values/strings.xml | 2 | ||||
-rw-r--r-- | src/main/res/xml/preferences.xml | 6 |
142 files changed, 804 insertions, 824 deletions
diff --git a/build.gradle b/build.gradle index 130fa6b1..dc50e49e 100644 --- a/build.gradle +++ b/build.gradle @@ -47,8 +47,8 @@ android { defaultConfig { minSdkVersion 14 targetSdkVersion 21 - versionCode 64 - versionName "1.5.2.1" + versionCode 02 + versionName "0.0.2" } compileOptions { @@ -86,7 +86,7 @@ android { if (variant.name.equals('release')) { variant.outputs.each { output -> if (output.zipAlign != null) { - output.zipAlign.outputFile = new File(output.outputFile.parent, rootProject.name + "-${variant.versionName}.apk") + output.zipAlign.outputFile = new File(output.outputFile.parent, "ConversationsPlus-${variant.versionName}.apk") } output.packageApplication.outputFile = new File(output.outputFile.parent, output.packageApplication.outputFile.name .replace(".apk", "-${variant.versionName}.apk")) diff --git a/manifest-merger-release-report.txt b/manifest-merger-release-report.txt index b02dcf65..fb0c2ade 100644 --- a/manifest-merger-release-report.txt +++ b/manifest-merger-release-report.txt @@ -70,11 +70,11 @@ MERGED from com.android.support:support-v4:21.0.3:16:5 ADDED from AndroidManifest.xml:22:9 tools:replace ADDED from AndroidManifest.xml:23:9 -service#eu.siacs.conversations.services.XmppConnectionService +service#de.thedevstack.conversationsplus.services.XmppConnectionService ADDED from AndroidManifest.xml:24:9 android:name ADDED from AndroidManifest.xml:24:18 -receiver#eu.siacs.conversations.services.EventReceiver +receiver#de.thedevstack.conversationsplus.services.EventReceiver ADDED from AndroidManifest.xml:26:9 android:name ADDED from AndroidManifest.xml:26:19 @@ -92,7 +92,7 @@ action#android.intent.action.ACTION_SHUTDOWN ADDED from AndroidManifest.xml:30:17 android:name ADDED from AndroidManifest.xml:30:25 -activity#eu.siacs.conversations.ui.ConversationActivity +activity#de.thedevstack.conversationsplus.ui.ConversationActivity ADDED from AndroidManifest.xml:34:9 android:label ADDED from AndroidManifest.xml:36:13 @@ -112,7 +112,7 @@ category#android.intent.category.LAUNCHER ADDED from AndroidManifest.xml:42:17 android:name ADDED from AndroidManifest.xml:42:27 -activity#eu.siacs.conversations.ui.StartConversationActivity +activity#de.thedevstack.conversationsplus.ui.StartConversationActivity ADDED from AndroidManifest.xml:45:9 android:label ADDED from AndroidManifest.xml:48:13 @@ -150,31 +150,31 @@ action#android.nfc.action.NDEF_DISCOVERED ADDED from AndroidManifest.xml:66:17 android:name ADDED from AndroidManifest.xml:66:25 -activity#eu.siacs.conversations.ui.SettingsActivity +activity#de.thedevstack.conversationsplus.ui.SettingsActivity ADDED from AndroidManifest.xml:73:9 android:label ADDED from AndroidManifest.xml:75:13 android:name ADDED from AndroidManifest.xml:74:13 -activity#eu.siacs.conversations.ui.ChooseContactActivity +activity#de.thedevstack.conversationsplus.ui.ChooseContactActivity ADDED from AndroidManifest.xml:76:9 android:label ADDED from AndroidManifest.xml:78:13 android:name ADDED from AndroidManifest.xml:77:13 -activity#eu.siacs.conversations.ui.BlocklistActivity +activity#de.thedevstack.conversationsplus.ui.BlocklistActivity ADDED from AndroidManifest.xml:79:9 android:label ADDED from AndroidManifest.xml:81:13 android:name ADDED from AndroidManifest.xml:80:13 -activity#eu.siacs.conversations.ui.ChangePasswordActivity +activity#de.thedevstack.conversationsplus.ui.ChangePasswordActivity ADDED from AndroidManifest.xml:82:6 android:label ADDED from AndroidManifest.xml:84:7 android:name ADDED from AndroidManifest.xml:83:7 -activity#eu.siacs.conversations.ui.ManageAccountActivity +activity#de.thedevstack.conversationsplus.ui.ManageAccountActivity ADDED from AndroidManifest.xml:85:9 android:label ADDED from AndroidManifest.xml:88:13 @@ -182,13 +182,13 @@ ADDED from AndroidManifest.xml:85:9 ADDED from AndroidManifest.xml:87:13 android:name ADDED from AndroidManifest.xml:86:13 -activity#eu.siacs.conversations.ui.EditAccountActivity +activity#de.thedevstack.conversationsplus.ui.EditAccountActivity ADDED from AndroidManifest.xml:89:9 android:windowSoftInputMode ADDED from AndroidManifest.xml:91:13 android:name ADDED from AndroidManifest.xml:90:13 -activity#eu.siacs.conversations.ui.ConferenceDetailsActivity +activity#de.thedevstack.conversationsplus.ui.ConferenceDetailsActivity ADDED from AndroidManifest.xml:92:9 android:label ADDED from AndroidManifest.xml:94:13 @@ -196,7 +196,7 @@ ADDED from AndroidManifest.xml:92:9 ADDED from AndroidManifest.xml:95:13 android:name ADDED from AndroidManifest.xml:93:13 -activity#eu.siacs.conversations.ui.ContactDetailsActivity +activity#de.thedevstack.conversationsplus.ui.ContactDetailsActivity ADDED from AndroidManifest.xml:96:9 android:label ADDED from AndroidManifest.xml:98:13 @@ -204,7 +204,7 @@ ADDED from AndroidManifest.xml:96:9 ADDED from AndroidManifest.xml:99:13 android:name ADDED from AndroidManifest.xml:97:13 -activity#eu.siacs.conversations.ui.PublishProfilePictureActivity +activity#de.thedevstack.conversationsplus.ui.PublishProfilePictureActivity ADDED from AndroidManifest.xml:100:9 android:label ADDED from AndroidManifest.xml:102:13 @@ -212,7 +212,7 @@ ADDED from AndroidManifest.xml:100:9 ADDED from AndroidManifest.xml:103:13 android:name ADDED from AndroidManifest.xml:101:13 -activity#eu.siacs.conversations.ui.VerifyOTRActivity +activity#de.thedevstack.conversationsplus.ui.VerifyOTRActivity ADDED from AndroidManifest.xml:104:9 android:label ADDED from AndroidManifest.xml:106:13 @@ -220,7 +220,7 @@ ADDED from AndroidManifest.xml:104:9 ADDED from AndroidManifest.xml:107:13 android:name ADDED from AndroidManifest.xml:105:13 -activity#eu.siacs.conversations.ui.ShareWithActivity +activity#de.thedevstack.conversationsplus.ui.ShareWithActivity ADDED from AndroidManifest.xml:108:9 android:label ADDED from AndroidManifest.xml:110:13 @@ -242,7 +242,7 @@ MERGED from Conversations.libs:MemorizingTrustManager:unspecified:12:9 ADDED from AndroidManifest.xml:129:13 android:name ADDED from AndroidManifest.xml:127:13 -activity#eu.siacs.conversations.ui.AboutActivity +activity#de.thedevstack.conversationsplus.ui.AboutActivity ADDED from AndroidManifest.xml:130:9 android:label ADDED from AndroidManifest.xml:132:13 diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 9fe37017..6e1b352a 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest - package="eu.siacs.conversations" + package="de.thedevstack.conversationsplus" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"> @@ -21,9 +21,9 @@ android:label="@string/app_name" android:theme="@style/ConversationsTheme" tools:replace="android:label" > - <service android:name=".services.XmppConnectionService" /> + <service android:name="de.thedevstack.conversationsplus.services.XmppConnectionService" /> - <receiver android:name=".services.EventReceiver" > + <receiver android:name="de.thedevstack.conversationsplus.services.EventReceiver" > <intent-filter> <action android:name="android.intent.action.BOOT_COMPLETED" /> <action android:name="android.net.conn.CONNECTIVITY_CHANGE" /> @@ -32,7 +32,7 @@ </receiver> <activity - android:name=".ui.ConversationActivity" + android:name="de.thedevstack.conversationsplus.ui.ConversationActivity" android:label="@string/app_name" android:launchMode="singleTask" android:windowSoftInputMode="stateHidden" > @@ -43,7 +43,7 @@ </intent-filter> </activity> <activity - android:name=".ui.StartConversationActivity" + android:name="de.thedevstack.conversationsplus.ui.StartConversationActivity" android:configChanges="orientation|screenSize" android:label="@string/title_activity_start_conversation" > <intent-filter> @@ -71,42 +71,42 @@ </intent-filter> </activity> <activity - android:name=".ui.SettingsActivity" + android:name="de.thedevstack.conversationsplus.ui.SettingsActivity" android:label="@string/title_activity_settings" /> <activity - android:name=".ui.ChooseContactActivity" + android:name="de.thedevstack.conversationsplus.ui.ChooseContactActivity" android:label="@string/title_activity_choose_contact" /> <activity - android:name=".ui.BlocklistActivity" + android:name="de.thedevstack.conversationsplus.ui.BlocklistActivity" android:label="@string/title_activity_block_list" /> <activity - android:name=".ui.ChangePasswordActivity" + android:name="de.thedevstack.conversationsplus.ui.ChangePasswordActivity" android:label="@string/change_password_on_server" /> <activity - android:name=".ui.ManageAccountActivity" + android:name="de.thedevstack.conversationsplus.ui.ManageAccountActivity" android:configChanges="orientation|screenSize" android:label="@string/title_activity_manage_accounts" /> <activity - android:name=".ui.EditAccountActivity" + android:name="de.thedevstack.conversationsplus.ui.EditAccountActivity" android:windowSoftInputMode="stateHidden|adjustResize" /> <activity - android:name=".ui.ConferenceDetailsActivity" + android:name="de.thedevstack.conversationsplus.ui.ConferenceDetailsActivity" android:label="@string/title_activity_conference_details" android:windowSoftInputMode="stateHidden" /> <activity - android:name=".ui.ContactDetailsActivity" + android:name="de.thedevstack.conversationsplus.ui.ContactDetailsActivity" android:label="@string/title_activity_contact_details" android:windowSoftInputMode="stateHidden" /> <activity - android:name=".ui.PublishProfilePictureActivity" + android:name="de.thedevstack.conversationsplus.ui.PublishProfilePictureActivity" android:label="@string/mgmt_account_publish_avatar" android:windowSoftInputMode="stateHidden" /> <activity - android:name=".ui.VerifyOTRActivity" + android:name="de.thedevstack.conversationsplus.ui.VerifyOTRActivity" android:label="@string/verify_otr" android:windowSoftInputMode="stateHidden" /> <activity - android:name=".ui.ShareWithActivity" + android:name="de.thedevstack.conversationsplus.ui.ShareWithActivity" android:label="@string/app_name" > <intent-filter> <action android:name="android.intent.action.SEND" /> @@ -135,12 +135,12 @@ android:theme="@style/ConversationsTheme" tools:replace="android:theme"/> <activity - android:name=".ui.AboutActivity" + android:name="de.thedevstack.conversationsplus.ui.AboutActivity" android:label="@string/title_activity_about" - android:parentActivityName=".ui.SettingsActivity" > + android:parentActivityName="de.thedevstack.conversationsplus.ui.SettingsActivity" > <meta-data android:name="android.support.PARENT_ACTIVITY" - android:value="eu.siacs.conversations.ui.SettingsActivity" /> + android:value="de.thedevstack.conversationsplus.ui.SettingsActivity" /> </activity> </application> diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/de/thedevstack/conversationsplus/Config.java index 00225f7b..01859dc4 100644 --- a/src/main/java/eu/siacs/conversations/Config.java +++ b/src/main/java/de/thedevstack/conversationsplus/Config.java @@ -1,8 +1,8 @@ -package eu.siacs.conversations; +package de.thedevstack.conversationsplus; import android.graphics.Bitmap; -import eu.siacs.conversations.xmpp.chatstate.ChatState; +import de.thedevstack.conversationsplus.xmpp.chatstate.ChatState; public final class Config { diff --git a/src/main/java/eu/siacs/conversations/crypto/OtrService.java b/src/main/java/de/thedevstack/conversationsplus/crypto/OtrService.java index c23a7fc8..ee7f492f 100644 --- a/src/main/java/eu/siacs/conversations/crypto/OtrService.java +++ b/src/main/java/de/thedevstack/conversationsplus/crypto/OtrService.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.crypto; +package de.thedevstack.conversationsplus.crypto; import java.math.BigInteger; import java.security.KeyFactory; @@ -16,15 +16,15 @@ import org.json.JSONObject; import android.util.Log; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.utils.CryptoHelper; -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.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.utils.CryptoHelper; +import de.thedevstack.conversationsplus.xmpp.chatstate.ChatState; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.stanzas.MessagePacket; import net.java.otr4j.OtrEngineHost; import net.java.otr4j.OtrException; diff --git a/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java b/src/main/java/de/thedevstack/conversationsplus/crypto/PgpEngine.java index 4a4d3f03..4b8e339c 100644 --- a/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java +++ b/src/main/java/de/thedevstack/conversationsplus/crypto/PgpEngine.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.crypto; +package de.thedevstack.conversationsplus.crypto; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -14,15 +14,15 @@ import org.openintents.openpgp.util.OpenPgpApi; import org.openintents.openpgp.util.OpenPgpApi.IOpenPgpCallback; import de.tzur.conversations.Settings; -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.http.HttpConnectionManager; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.ui.UiCallback; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.DownloadableFile; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.http.HttpConnectionManager; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.ui.UiCallback; import android.app.PendingIntent; import android.content.Intent; import android.net.Uri; diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/DigestMd5.java b/src/main/java/de/thedevstack/conversationsplus/crypto/sasl/DigestMd5.java index 8b16215b..f4c3f28e 100644 --- a/src/main/java/eu/siacs/conversations/crypto/sasl/DigestMd5.java +++ b/src/main/java/de/thedevstack/conversationsplus/crypto/sasl/DigestMd5.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.crypto.sasl; +package de.thedevstack.conversationsplus.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.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.utils.CryptoHelper; +import de.thedevstack.conversationsplus.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/Plain.java b/src/main/java/de/thedevstack/conversationsplus/crypto/sasl/Plain.java index 40a55151..179c12de 100644 --- a/src/main/java/eu/siacs/conversations/crypto/sasl/Plain.java +++ b/src/main/java/de/thedevstack/conversationsplus/crypto/sasl/Plain.java @@ -1,11 +1,11 @@ -package eu.siacs.conversations.crypto.sasl; +package de.thedevstack.conversationsplus.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.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/crypto/sasl/SaslMechanism.java index 14d8b944..ed2764c8 100644 --- a/src/main/java/eu/siacs/conversations/crypto/sasl/SaslMechanism.java +++ b/src/main/java/de/thedevstack/conversationsplus/crypto/sasl/SaslMechanism.java @@ -1,9 +1,9 @@ -package eu.siacs.conversations.crypto.sasl; +package de.thedevstack.conversationsplus.crypto.sasl; import java.security.SecureRandom; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.xml.TagWriter; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.xml.TagWriter; public abstract class SaslMechanism { diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java b/src/main/java/de/thedevstack/conversationsplus/crypto/sasl/ScramSha1.java index c95a62df..a991b1d7 100644 --- a/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java +++ b/src/main/java/de/thedevstack/conversationsplus/crypto/sasl/ScramSha1.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.crypto.sasl; +package de.thedevstack.conversationsplus.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.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.utils.CryptoHelper; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/crypto/sasl/Tokenizer.java index e37e0fa7..cc2805de 100644 --- a/src/main/java/eu/siacs/conversations/crypto/sasl/Tokenizer.java +++ b/src/main/java/de/thedevstack/conversationsplus/crypto/sasl/Tokenizer.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.crypto.sasl; +package de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/entities/AbstractEntity.java index 957b0a14..ebc0a8d5 100644 --- a/src/main/java/eu/siacs/conversations/entities/AbstractEntity.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/AbstractEntity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; import android.content.ContentValues; diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/de/thedevstack/conversationsplus/entities/Account.java index f472361f..530adf06 100644 --- a/src/main/java/eu/siacs/conversations/entities/Account.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/Account.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; import android.content.ContentValues; import android.database.Cursor; @@ -17,13 +17,13 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArraySet; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -import eu.siacs.conversations.crypto.OtrService; -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.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.crypto.OtrEngine; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.xmpp.XmppConnection; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/entities/Blockable.java index dbcd55c4..beff901d 100644 --- a/src/main/java/eu/siacs/conversations/entities/Blockable.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/Blockable.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/entities/Bookmark.java index 06c46c1c..9e67bf2d 100644 --- a/src/main/java/eu/siacs/conversations/entities/Bookmark.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/Bookmark.java @@ -1,4 +1,6 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; + +import android.graphics.Color; import android.graphics.Color; @@ -6,9 +8,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.thedevstack.conversationsplus.utils.UIHelper; +import de.thedevstack.conversationsplus.xml.Element; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/entities/Contact.java index a215874f..d72a1197 100644 --- a/src/main/java/eu/siacs/conversations/entities/Contact.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/Contact.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; import android.content.ContentValues; import android.database.Cursor; @@ -12,11 +12,11 @@ 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.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.pep.Avatar; +import de.thedevstack.conversationsplus.utils.UIHelper; +import de.thedevstack.conversationsplus.xml.Element; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/entities/Conversation.java index 289ed4ea..81c2eb4b 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; import android.content.ContentValues; import android.database.Cursor; @@ -19,10 +19,10 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.xmpp.chatstate.ChatState; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.xmpp.chatstate.ChatState; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; public class Conversation extends AbstractEntity implements Blockable { public static final String TABLENAME = "conversations"; diff --git a/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java b/src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java index ae9ba1f1..9a677cd0 100644 --- a/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; import java.io.File; import java.io.FileInputStream; @@ -19,8 +19,8 @@ import javax.crypto.NoSuchPaddingException; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.utils.MimeUtils; +import de.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.utils.MimeUtils; import android.util.Log; diff --git a/src/main/java/eu/siacs/conversations/entities/ListItem.java b/src/main/java/de/thedevstack/conversationsplus/entities/ListItem.java index aba2aef2..9daf90d1 100644 --- a/src/main/java/eu/siacs/conversations/entities/ListItem.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/ListItem.java @@ -1,8 +1,8 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; import java.util.List; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; public interface ListItem extends Comparable<ListItem> { public String getDisplayName(); diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/de/thedevstack/conversationsplus/entities/Message.java index 9a904cab..68b47578 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/Message.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; import android.content.ContentValues; import android.database.Cursor; @@ -7,12 +7,12 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Arrays; -import eu.siacs.conversations.Config; -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.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.utils.GeoHelper; +import de.thedevstack.conversationsplus.utils.MimeUtils; +import de.thedevstack.conversationsplus.utils.UIHelper; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/entities/MucOptions.java index d867a370..22155f3e 100644 --- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/MucOptions.java @@ -1,15 +1,15 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import eu.siacs.conversations.R; -import eu.siacs.conversations.crypto.PgpEngine; -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.stanzas.PresencePacket; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.crypto.PgpEngine; +import de.thedevstack.conversationsplus.xml.Element; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.stanzas.PresencePacket; import android.annotation.SuppressLint; diff --git a/src/main/java/eu/siacs/conversations/entities/Presences.java b/src/main/java/de/thedevstack/conversationsplus/entities/Presences.java index bccf3117..cb984648 100644 --- a/src/main/java/eu/siacs/conversations/entities/Presences.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/Presences.java @@ -1,10 +1,10 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; import java.util.Hashtable; import java.util.Iterator; import java.util.Map.Entry; -import eu.siacs.conversations.xml.Element; +import de.thedevstack.conversationsplus.xml.Element; public class Presences { diff --git a/src/main/java/eu/siacs/conversations/entities/Roster.java b/src/main/java/de/thedevstack/conversationsplus/entities/Roster.java index 628a31d1..b1cb78b4 100644 --- a/src/main/java/eu/siacs/conversations/entities/Roster.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/Roster.java @@ -1,11 +1,11 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.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.thedevstack.conversationsplus.xmpp.jid.Jid; public class Roster { final Account account; diff --git a/src/main/java/eu/siacs/conversations/entities/Transferable.java b/src/main/java/de/thedevstack/conversationsplus/entities/Transferable.java index 2db6e3c9..a5bdb5d7 100644 --- a/src/main/java/eu/siacs/conversations/entities/Transferable.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/Transferable.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; public interface Transferable { diff --git a/src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java b/src/main/java/de/thedevstack/conversationsplus/entities/TransferablePlaceholder.java index e065953e..c51320d1 100644 --- a/src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/TransferablePlaceholder.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; public class TransferablePlaceholder implements Transferable { diff --git a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java b/src/main/java/de/thedevstack/conversationsplus/generator/AbstractGenerator.java index 186b4b98..cb56228d 100644 --- a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java +++ b/src/main/java/de/thedevstack/conversationsplus/generator/AbstractGenerator.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.generator; +package de.thedevstack.conversationsplus.generator; import android.util.Base64; @@ -13,8 +13,8 @@ import java.util.Locale; import java.util.TimeZone; import de.tzur.conversations.Settings; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.utils.PhoneHelper; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.utils.PhoneHelper; 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/thedevstack/conversationsplus/generator/IqGenerator.java index 47915e3f..8199e59c 100644 --- a/src/main/java/eu/siacs/conversations/generator/IqGenerator.java +++ b/src/main/java/de/thedevstack/conversationsplus/generator/IqGenerator.java @@ -1,21 +1,21 @@ -package eu.siacs.conversations.generator; +package de.thedevstack.conversationsplus.generator; import java.util.ArrayList; import java.util.List; -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.PhoneHelper; -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.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.DownloadableFile; +import de.thedevstack.conversationsplus.services.MessageArchiveService; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.utils.PhoneHelper; +import de.thedevstack.conversationsplus.utils.Xmlns; +import de.thedevstack.conversationsplus.xml.Element; +import de.thedevstack.conversationsplus.xmpp.forms.Data; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.pep.Avatar; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/generator/MessageGenerator.java index e698c151..fa327141 100644 --- a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java +++ b/src/main/java/de/thedevstack/conversationsplus/generator/MessageGenerator.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.generator; +package de.thedevstack.conversationsplus.generator; import java.text.SimpleDateFormat; import java.util.Date; @@ -7,14 +7,14 @@ import java.util.TimeZone; import net.java.otr4j.OtrException; import net.java.otr4j.session.Session; -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.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.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.xml.Element; +import de.thedevstack.conversationsplus.xmpp.chatstate.ChatState; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.stanzas.MessagePacket; public class MessageGenerator extends AbstractGenerator { public MessageGenerator(XmppConnectionService service) { diff --git a/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java b/src/main/java/de/thedevstack/conversationsplus/generator/PresenceGenerator.java index c40c6d05..896aad71 100644 --- a/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java +++ b/src/main/java/de/thedevstack/conversationsplus/generator/PresenceGenerator.java @@ -1,10 +1,10 @@ -package eu.siacs.conversations.generator; +package de.thedevstack.conversationsplus.generator; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Contact; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.stanzas.PresencePacket; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.xml.Element; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/http/HttpConnectionManager.java index 58a6d1e3..484e77a3 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java +++ b/src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.http; +package de.thedevstack.conversationsplus.http; import org.apache.http.conn.ssl.StrictHostnameVerifier; @@ -13,10 +13,10 @@ 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 de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.services.AbstractConnectionManager; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.utils.CryptoHelper; public class HttpConnectionManager extends AbstractConnectionManager { diff --git a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java b/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java index 62fe4191..3f66be21 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java +++ b/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.http; +package de.thedevstack.conversationsplus.http; import android.content.Intent; import android.net.Uri; @@ -16,13 +16,13 @@ import java.util.Arrays; 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.Transferable; -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 de.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Transferable; +import de.thedevstack.conversationsplus.entities.DownloadableFile; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.utils.CryptoHelper; public class HttpDownloadConnection implements Transferable { diff --git a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java b/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java index a3ab8dab..a9682718 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java +++ b/src/main/java/de/thedevstack/conversationsplus/http/HttpUploadConnection.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.http; +package de.thedevstack.conversationsplus.http; import android.app.PendingIntent; import android.util.Log; @@ -12,20 +12,20 @@ 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.Transferable; -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 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.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Transferable; +import de.thedevstack.conversationsplus.entities.DownloadableFile; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.persistance.FileBackend; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.ui.UiCallback; +import de.thedevstack.conversationsplus.utils.CryptoHelper; +import de.thedevstack.conversationsplus.utils.Xmlns; +import de.thedevstack.conversationsplus.xml.Element; +import de.thedevstack.conversationsplus.xmpp.OnIqPacketReceived; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/parser/AbstractParser.java index 11ddcc13..87238f9e 100644 --- a/src/main/java/eu/siacs/conversations/parser/AbstractParser.java +++ b/src/main/java/de/thedevstack/conversationsplus/parser/AbstractParser.java @@ -1,6 +1,4 @@ -package eu.siacs.conversations.parser; - -import android.util.Log; +package de.thedevstack.conversationsplus.parser; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -10,12 +8,12 @@ import java.util.Locale; import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Contact; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.stanzas.MessagePacket; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.xml.Element; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.stanzas.MessagePacket; public abstract class AbstractParser { diff --git a/src/main/java/eu/siacs/conversations/parser/IqParser.java b/src/main/java/de/thedevstack/conversationsplus/parser/IqParser.java index 6039d395..f76dbf03 100644 --- a/src/main/java/eu/siacs/conversations/parser/IqParser.java +++ b/src/main/java/de/thedevstack/conversationsplus/parser/IqParser.java @@ -1,20 +1,20 @@ -package eu.siacs.conversations.parser; +package de.thedevstack.conversationsplus.parser; import android.util.Log; import java.util.ArrayList; import java.util.Collection; -import eu.siacs.conversations.Config; -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.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.utils.Xmlns; +import de.thedevstack.conversationsplus.xml.Element; +import de.thedevstack.conversationsplus.xmpp.OnIqPacketReceived; +import de.thedevstack.conversationsplus.xmpp.OnUpdateBlocklist; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/parser/MessageParser.java index 81fd89cd..1977e126 100644 --- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java +++ b/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.parser; +package de.thedevstack.conversationsplus.parser; import android.util.Log; import android.util.Pair; @@ -7,22 +7,22 @@ import net.java.otr4j.session.Session; import net.java.otr4j.session.SessionStatus; import de.tzur.conversations.Settings; -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.entities.MucOptions; -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.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.entities.MucOptions; +import de.thedevstack.conversationsplus.http.HttpConnectionManager; +import de.thedevstack.conversationsplus.services.MessageArchiveService; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.utils.CryptoHelper; +import de.thedevstack.conversationsplus.xml.Element; +import de.thedevstack.conversationsplus.xmpp.OnMessagePacketReceived; +import de.thedevstack.conversationsplus.xmpp.chatstate.ChatState; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.pep.Avatar; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/parser/PresenceParser.java index d83347d8..888845c2 100644 --- a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java +++ b/src/main/java/de/thedevstack/conversationsplus/parser/PresenceParser.java @@ -1,20 +1,20 @@ -package eu.siacs.conversations.parser; +package de.thedevstack.conversationsplus.parser; import java.util.ArrayList; -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.MucOptions; -import eu.siacs.conversations.entities.Presences; -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.thedevstack.conversationsplus.crypto.PgpEngine; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.MucOptions; +import de.thedevstack.conversationsplus.entities.Presences; +import de.thedevstack.conversationsplus.generator.PresenceGenerator; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.xml.Element; +import de.thedevstack.conversationsplus.xmpp.OnPresencePacketReceived; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.pep.Avatar; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/persistance/DatabaseBackend.java index d11b02fa..21eaf476 100644 --- a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java +++ b/src/main/java/de/thedevstack/conversationsplus/persistance/DatabaseBackend.java @@ -1,17 +1,17 @@ -package eu.siacs.conversations.persistance; +package de.thedevstack.conversationsplus.persistance; import java.util.ArrayList; 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.Contact; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.entities.Message; -import eu.siacs.conversations.entities.Roster; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.entities.Roster; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; import android.content.Context; import android.database.Cursor; diff --git a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java index ab191285..3a245d62 100644 --- a/src/main/java/eu/siacs/conversations/persistance/FileBackend.java +++ b/src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.persistance; +package de.thedevstack.conversationsplus.persistance; import java.io.ByteArrayOutputStream; import java.io.Closeable; @@ -31,15 +31,15 @@ import android.util.Base64OutputStream; import android.util.Log; import android.webkit.MimeTypeMap; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Transferable; -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.xmpp.pep.Avatar; +import de.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Transferable; +import de.thedevstack.conversationsplus.entities.DownloadableFile; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.utils.CryptoHelper; +import de.thedevstack.conversationsplus.utils.ExifHelper; +import de.thedevstack.conversationsplus.xmpp.pep.Avatar; public class FileBackend { diff --git a/src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java b/src/main/java/de/thedevstack/conversationsplus/persistance/OnPhoneContactsMerged.java index 6a457b17..cfbb6ef1 100644 --- a/src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java +++ b/src/main/java/de/thedevstack/conversationsplus/persistance/OnPhoneContactsMerged.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.persistance; +package de.thedevstack.conversationsplus.persistance; public interface OnPhoneContactsMerged { public void phoneContactsMerged(); diff --git a/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java b/src/main/java/de/thedevstack/conversationsplus/services/AbstractConnectionManager.java index 676a09c9..0dedc01d 100644 --- a/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java +++ b/src/main/java/de/thedevstack/conversationsplus/services/AbstractConnectionManager.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.services; +package de.thedevstack.conversationsplus.services; public class AbstractConnectionManager { protected XmppConnectionService mXmppConnectionService; diff --git a/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java index 7412eb93..7321fc08 100644 --- a/src/main/java/eu/siacs/conversations/services/AvatarService.java +++ b/src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.services; +package de.thedevstack.conversationsplus.services; import android.graphics.Bitmap; import android.graphics.Canvas; @@ -11,13 +11,13 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Bookmark; -import eu.siacs.conversations.entities.Contact; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.entities.ListItem; -import eu.siacs.conversations.entities.MucOptions; -import eu.siacs.conversations.utils.UIHelper; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Bookmark; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.ListItem; +import de.thedevstack.conversationsplus.entities.MucOptions; +import de.thedevstack.conversationsplus.utils.UIHelper; public class AvatarService { diff --git a/src/main/java/eu/siacs/conversations/services/EventReceiver.java b/src/main/java/de/thedevstack/conversationsplus/services/EventReceiver.java index dfbe9db7..4367dd1b 100644 --- a/src/main/java/eu/siacs/conversations/services/EventReceiver.java +++ b/src/main/java/de/thedevstack/conversationsplus/services/EventReceiver.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.services; +package de.thedevstack.conversationsplus.services; -import eu.siacs.conversations.persistance.DatabaseBackend; +import de.thedevstack.conversationsplus.persistance.DatabaseBackend; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; diff --git a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java b/src/main/java/de/thedevstack/conversationsplus/services/MessageArchiveService.java index 0bc428c8..2b8ed579 100644 --- a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java +++ b/src/main/java/de/thedevstack/conversationsplus/services/MessageArchiveService.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.services; +package de.thedevstack.conversationsplus.services; import android.util.Log; @@ -8,16 +8,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.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.generator.AbstractGenerator; +import de.thedevstack.conversationsplus.xml.Element; +import de.thedevstack.conversationsplus.xmpp.OnAdvancedStreamFeaturesLoaded; +import de.thedevstack.conversationsplus.xmpp.OnIqPacketReceived; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/services/NotificationService.java index 09d223b3..52d7e2a2 100644 --- a/src/main/java/eu/siacs/conversations/services/NotificationService.java +++ b/src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.services; +package de.thedevstack.conversationsplus.services; import android.annotation.SuppressLint; import android.app.Notification; @@ -32,16 +32,16 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import de.tzur.conversations.Settings; -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.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.ui.ConversationActivity; +import de.thedevstack.conversationsplus.ui.ManageAccountActivity; +import de.thedevstack.conversationsplus.ui.TimePreference; +import de.thedevstack.conversationsplus.utils.GeoHelper; +import de.thedevstack.conversationsplus.utils.UIHelper; public class NotificationService { diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java index 27bc502a..e5125f29 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.services; +package de.thedevstack.conversationsplus.services; import android.annotation.SuppressLint; import android.app.AlarmManager; @@ -50,58 +50,58 @@ import java.util.concurrent.CopyOnWriteArrayList; import de.duenndns.ssl.MemorizingTrustManager; import de.tzur.conversations.Settings; -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.Blockable; -import eu.siacs.conversations.entities.Bookmark; -import eu.siacs.conversations.entities.Contact; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.entities.Transferable; -import eu.siacs.conversations.entities.TransferablePlaceholder; -import eu.siacs.conversations.entities.Message; -import eu.siacs.conversations.entities.MucOptions; -import eu.siacs.conversations.entities.MucOptions.OnRenameListener; -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.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.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.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.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.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.crypto.PgpEngine; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Blockable; +import de.thedevstack.conversationsplus.entities.Bookmark; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.Transferable; +import de.thedevstack.conversationsplus.entities.TransferablePlaceholder; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.entities.MucOptions; +import de.thedevstack.conversationsplus.entities.MucOptions.OnRenameListener; +import de.thedevstack.conversationsplus.generator.IqGenerator; +import de.thedevstack.conversationsplus.generator.MessageGenerator; +import de.thedevstack.conversationsplus.generator.PresenceGenerator; +import de.thedevstack.conversationsplus.http.HttpConnectionManager; +import de.thedevstack.conversationsplus.parser.IqParser; +import de.thedevstack.conversationsplus.parser.MessageParser; +import de.thedevstack.conversationsplus.parser.PresenceParser; +import de.thedevstack.conversationsplus.persistance.DatabaseBackend; +import de.thedevstack.conversationsplus.persistance.FileBackend; +import de.thedevstack.conversationsplus.ui.UiCallback; +import de.thedevstack.conversationsplus.utils.CryptoHelper; +import de.thedevstack.conversationsplus.utils.ExceptionHelper; +import de.thedevstack.conversationsplus.utils.OnPhoneContactsLoadedListener; +import de.thedevstack.conversationsplus.utils.PRNGFixes; +import de.thedevstack.conversationsplus.utils.PhoneHelper; +import de.thedevstack.conversationsplus.utils.SerialSingleThreadExecutor; +import de.thedevstack.conversationsplus.utils.Xmlns; +import de.thedevstack.conversationsplus.xml.Element; +import de.thedevstack.conversationsplus.xmpp.OnBindListener; +import de.thedevstack.conversationsplus.xmpp.OnContactStatusChanged; +import de.thedevstack.conversationsplus.xmpp.OnIqPacketReceived; +import de.thedevstack.conversationsplus.xmpp.OnMessageAcknowledged; +import de.thedevstack.conversationsplus.xmpp.OnMessagePacketReceived; +import de.thedevstack.conversationsplus.xmpp.OnPresencePacketReceived; +import de.thedevstack.conversationsplus.xmpp.OnStatusChanged; +import de.thedevstack.conversationsplus.xmpp.OnUpdateBlocklist; +import de.thedevstack.conversationsplus.xmpp.XmppConnection; +import de.thedevstack.conversationsplus.xmpp.chatstate.ChatState; +import de.thedevstack.conversationsplus.xmpp.forms.Data; +import de.thedevstack.conversationsplus.xmpp.forms.Field; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.jingle.JingleConnectionManager; +import de.thedevstack.conversationsplus.xmpp.jingle.OnJinglePacketReceived; +import de.thedevstack.conversationsplus.xmpp.jingle.stanzas.JinglePacket; +import de.thedevstack.conversationsplus.xmpp.pep.Avatar; +import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket; +import de.thedevstack.conversationsplus.xmpp.stanzas.MessagePacket; +import de.thedevstack.conversationsplus.xmpp.stanzas.PresencePacket; import me.leolin.shortcutbadger.ShortcutBadger; public class XmppConnectionService extends Service implements OnPhoneContactsLoadedListener { diff --git a/src/main/java/eu/siacs/conversations/ui/AboutActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/AboutActivity.java index a61b872a..fd8a187a 100644 --- a/src/main/java/eu/siacs/conversations/ui/AboutActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/AboutActivity.java @@ -1,9 +1,9 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.app.Activity; import android.os.Bundle; -import eu.siacs.conversations.R; +import de.thedevstack.conversationsplus.R; public class AboutActivity extends Activity { diff --git a/src/main/java/eu/siacs/conversations/ui/AboutPreference.java b/src/main/java/de/thedevstack/conversationsplus/ui/AboutPreference.java index a57e1b89..c1fd4d67 100644 --- a/src/main/java/eu/siacs/conversations/ui/AboutPreference.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/AboutPreference.java @@ -1,12 +1,11 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.content.Context; import android.content.Intent; -import android.content.pm.PackageManager; import android.preference.Preference; import android.util.AttributeSet; -import eu.siacs.conversations.utils.PhoneHelper; +import de.thedevstack.conversationsplus.utils.PhoneHelper; public class AboutPreference extends Preference { public AboutPreference(final Context context, final AttributeSet attrs, final int defStyle) { @@ -27,7 +26,7 @@ public class AboutPreference extends Preference { } private void setSummary() { - setSummary("Conversations " + PhoneHelper.getVersionName(getContext())); + setSummary("Conversations+ " + PhoneHelper.getVersionName(getContext())); } } diff --git a/src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/AbstractSearchableListItemActivity.java index 1a9fc95c..b8e57f47 100644 --- a/src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/AbstractSearchableListItemActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.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.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.ListItem; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/ui/BlockContactDialog.java index 9cf7e9f8..589f565c 100644 --- a/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/BlockContactDialog.java @@ -1,12 +1,12 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.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.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Blockable; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/ui/BlocklistActivity.java index 13d7f4fc..4e6d7701 100644 --- a/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/BlocklistActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.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.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.xmpp.OnUpdateBlocklist; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/ui/ChangePasswordActivity.java index aac435fd..9d6b50fc 100644 --- a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/ChangePasswordActivity.java @@ -1,17 +1,16 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.os.Bundle; import android.view.View; import android.widget.Button; 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 eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; 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/thedevstack/conversationsplus/ui/ChooseContactActivity.java index c9e99ce5..d51d23e1 100644 --- a/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/ChooseContactActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.content.Context; import android.content.Intent; @@ -19,10 +19,10 @@ import java.util.Collections; import java.util.List; import java.util.ArrayList; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Contact; -import eu.siacs.conversations.entities.ListItem; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.ListItem; public class ChooseContactActivity extends AbstractSearchableListItemActivity { diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ConferenceDetailsActivity.java index 07b8819d..de6436d9 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/ConferenceDetailsActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.annotation.TargetApi; import android.app.AlertDialog; @@ -27,20 +27,19 @@ import org.openintents.openpgp.util.OpenPgpUtils; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; -import java.util.List; - -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.OnMucRosterUpdate; -import eu.siacs.conversations.services.XmppConnectionService.OnConversationUpdate; -import eu.siacs.conversations.xmpp.jid.Jid; + +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.crypto.PgpEngine; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Bookmark; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.MucOptions; +import de.thedevstack.conversationsplus.entities.MucOptions.User; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.services.XmppConnectionService.OnMucRosterUpdate; +import de.thedevstack.conversationsplus.services.XmppConnectionService.OnConversationUpdate; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/ui/ContactDetailsActivity.java index c190caed..c84f9b89 100644 --- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/ContactDetailsActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.app.AlertDialog; import android.app.PendingIntent; @@ -32,19 +32,19 @@ import org.openintents.openpgp.util.OpenPgpUtils; import java.util.List; -import eu.siacs.conversations.R; -import eu.siacs.conversations.crypto.PgpEngine; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Contact; -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.OnUpdateBlocklist; -import eu.siacs.conversations.xmpp.XmppConnection; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.crypto.PgpEngine; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.ListItem; +import de.thedevstack.conversationsplus.services.XmppConnectionService.OnAccountUpdate; +import de.thedevstack.conversationsplus.services.XmppConnectionService.OnRosterUpdate; +import de.thedevstack.conversationsplus.utils.CryptoHelper; +import de.thedevstack.conversationsplus.utils.UIHelper; +import de.thedevstack.conversationsplus.xmpp.OnUpdateBlocklist; +import de.thedevstack.conversationsplus.xmpp.XmppConnection; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; public class ContactDetailsActivity extends XmppActivity implements OnAccountUpdate, OnRosterUpdate, OnUpdateBlocklist { 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/thedevstack/conversationsplus/ui/ConversationActivity.java index 0504ff34..f5de4ae8 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.annotation.SuppressLint; import android.app.ActionBar; @@ -34,25 +34,25 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import eu.siacs.conversations.R; -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.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.xmpp.OnUpdateBlocklist; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Blockable; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.services.XmppConnectionService.OnAccountUpdate; +import de.thedevstack.conversationsplus.services.XmppConnectionService.OnConversationUpdate; +import de.thedevstack.conversationsplus.services.XmppConnectionService.OnRosterUpdate; +import de.thedevstack.conversationsplus.ui.adapter.ConversationAdapter; +import de.thedevstack.conversationsplus.utils.ExceptionHelper; +import de.thedevstack.conversationsplus.xmpp.OnUpdateBlocklist; import github.ankushsachdeva.emojicon.EmojiconEditText; public class ConversationActivity extends XmppActivity implements OnAccountUpdate, OnConversationUpdate, OnRosterUpdate, OnUpdateBlocklist, XmppConnectionService.OnShowErrorToast { - public static final String ACTION_DOWNLOAD = "eu.siacs.conversations.action.DOWNLOAD"; + public static final String ACTION_DOWNLOAD = "de.thedevstack.conversationsplus.action.DOWNLOAD"; public static final String VIEW_CONVERSATION = "viewConversation"; public static final String CONVERSATION = "conversationUuid"; @@ -433,11 +433,11 @@ public class ConversationActivity extends XmppActivity break; case ATTACHMENT_CHOICE_RECORD_VOICE: intent.setAction(MediaStore.Audio.Media.RECORD_SOUND_ACTION); - fallbackPackageId = "eu.siacs.conversations.voicerecorder"; + fallbackPackageId = "de.thedevstack.conversationsplus.voicerecorder"; break; case ATTACHMENT_CHOICE_LOCATION: - intent.setAction("eu.siacs.conversations.location.request"); - fallbackPackageId = "eu.siacs.conversations.sharelocation"; + intent.setAction("de.thedevstack.conversationsplus.location.request"); + fallbackPackageId = "de.thedevstack.conversationsplus.sharelocation"; break; } if (intent.resolveActivity(getPackageManager()) != null) { @@ -651,7 +651,7 @@ public class ConversationActivity extends XmppActivity if (new Intent(MediaStore.Audio.Media.RECORD_SOUND_ACTION).resolveActivity(getPackageManager()) == null) { attachFilePopup.getMenu().findItem(R.id.attach_record_voice).setVisible(false); } - if (new Intent("eu.siacs.conversations.location.request").resolveActivity(getPackageManager()) == null) { + if (new Intent("de.thedevstack.conversationsplus.location.request").resolveActivity(getPackageManager()) == null) { attachFilePopup.getMenu().findItem(R.id.attach_location).setVisible(false); } attachFilePopup.setOnMenuItemClickListener(new OnMenuItemClickListener() { diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java index 5a672520..a30b3483 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.app.AlertDialog; import android.app.Fragment; @@ -43,28 +43,28 @@ import java.util.NoSuchElementException; import java.util.concurrent.ConcurrentLinkedQueue; import de.tzur.conversations.Settings; -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.Contact; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.entities.Transferable; -import eu.siacs.conversations.entities.DownloadableFile; -import eu.siacs.conversations.entities.TransferablePlaceholder; -import eu.siacs.conversations.entities.Message; -import eu.siacs.conversations.entities.MucOptions; -import eu.siacs.conversations.entities.Presences; -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.chatstate.ChatState; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.crypto.PgpEngine; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.Transferable; +import de.thedevstack.conversationsplus.entities.DownloadableFile; +import de.thedevstack.conversationsplus.entities.TransferablePlaceholder; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.entities.MucOptions; +import de.thedevstack.conversationsplus.entities.Presences; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.ui.XmppActivity.OnPresenceSelected; +import de.thedevstack.conversationsplus.ui.XmppActivity.OnValueEdited; +import de.thedevstack.conversationsplus.ui.adapter.MessageAdapter; +import de.thedevstack.conversationsplus.ui.adapter.MessageAdapter.OnContactPictureClicked; +import de.thedevstack.conversationsplus.ui.adapter.MessageAdapter.OnContactPictureLongClicked; +import de.thedevstack.conversationsplus.utils.GeoHelper; +import de.thedevstack.conversationsplus.utils.UIHelper; +import de.thedevstack.conversationsplus.xmpp.chatstate.ChatState; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; import github.ankushsachdeva.emojicon.EmojiconEditText; import github.ankushsachdeva.emojicon.EmojiconGridView; import github.ankushsachdeva.emojicon.EmojiconsPopup; diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/EditAccountActivity.java index 908c29d2..efcd4128 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/EditAccountActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.app.PendingIntent; import android.content.Intent; @@ -23,16 +23,16 @@ import android.widget.TableLayout; 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.OnAccountUpdate; -import eu.siacs.conversations.ui.adapter.KnownHostsAdapter; -import eu.siacs.conversations.utils.CryptoHelper; -import eu.siacs.conversations.utils.UIHelper; -import eu.siacs.conversations.xmpp.XmppConnection.Features; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.pep.Avatar; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.services.XmppConnectionService.OnAccountUpdate; +import de.thedevstack.conversationsplus.ui.adapter.KnownHostsAdapter; +import de.thedevstack.conversationsplus.utils.CryptoHelper; +import de.thedevstack.conversationsplus.utils.UIHelper; +import de.thedevstack.conversationsplus.xmpp.XmppConnection.Features; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.pep.Avatar; public class EditAccountActivity extends XmppActivity implements OnAccountUpdate{ diff --git a/src/main/java/eu/siacs/conversations/ui/EditMessage.java b/src/main/java/de/thedevstack/conversationsplus/ui/EditMessage.java index a7aa2024..5c2e6164 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditMessage.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/EditMessage.java @@ -1,12 +1,11 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.content.Context; import android.os.Handler; import android.util.AttributeSet; import android.view.KeyEvent; -import android.widget.EditText; -import eu.siacs.conversations.Config; +import de.thedevstack.conversationsplus.Config; import github.ankushsachdeva.emojicon.EmojiconEditText; public class EditMessage extends EmojiconEditText { diff --git a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ManageAccountActivity.java index 56dbc55e..0820ec8b 100644 --- a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/ManageAccountActivity.java @@ -1,12 +1,12 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import java.util.ArrayList; import java.util.List; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.services.XmppConnectionService.OnAccountUpdate; -import eu.siacs.conversations.ui.adapter.AccountAdapter; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.services.XmppConnectionService.OnAccountUpdate; +import de.thedevstack.conversationsplus.ui.adapter.AccountAdapter; import android.app.AlertDialog; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; diff --git a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/PublishProfilePictureActivity.java index 4333dbdb..be08da14 100644 --- a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/PublishProfilePictureActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.app.PendingIntent; import android.content.Intent; @@ -13,12 +13,12 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.utils.PhoneHelper; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.pep.Avatar; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.utils.PhoneHelper; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.pep.Avatar; public class PublishProfilePictureActivity extends XmppActivity { diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java index f3d5d8bd..36e2cca0 100644 --- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import java.security.KeyStoreException; import java.util.ArrayList; @@ -9,9 +9,9 @@ import java.util.Locale; import de.tzur.conversations.Settings; import de.duenndns.ssl.MemorizingTrustManager; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.xmpp.XmppConnection; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.xmpp.XmppConnection; import android.app.AlertDialog; import android.app.Fragment; diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsFragment.java b/src/main/java/de/thedevstack/conversationsplus/ui/SettingsFragment.java index e4185abc..a549ff94 100644 --- a/src/main/java/eu/siacs/conversations/ui/SettingsFragment.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/SettingsFragment.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.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.thedevstack.conversationsplus.R; public class SettingsFragment extends PreferenceFragment { diff --git a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java index 351f1dfc..55a19b42 100644 --- a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/ShareWithActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.app.PendingIntent; import android.content.Intent; @@ -17,14 +17,14 @@ import java.util.ArrayList; 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.entities.Message; -import eu.siacs.conversations.ui.adapter.ConversationAdapter; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.ui.adapter.ConversationAdapter; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; public class ShareWithActivity extends XmppActivity { diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java index 68e77af4..c5ac3985 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.annotation.SuppressLint; import android.annotation.TargetApi; @@ -52,23 +52,23 @@ import java.util.Arrays; import java.util.Collections; 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.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.Presences; -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.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Blockable; +import de.thedevstack.conversationsplus.entities.Bookmark; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.ListItem; +import de.thedevstack.conversationsplus.entities.Presences; +import de.thedevstack.conversationsplus.services.XmppConnectionService.OnRosterUpdate; +import de.thedevstack.conversationsplus.ui.adapter.KnownHostsAdapter; +import de.thedevstack.conversationsplus.ui.adapter.ListItemAdapter; +import de.thedevstack.conversationsplus.utils.XmppUri; +import de.thedevstack.conversationsplus.xmpp.XmppConnection; +import de.thedevstack.conversationsplus.xmpp.OnUpdateBlocklist; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; public class StartConversationActivity extends XmppActivity implements OnRosterUpdate, OnUpdateBlocklist { diff --git a/src/main/java/eu/siacs/conversations/ui/TimePreference.java b/src/main/java/de/thedevstack/conversationsplus/ui/TimePreference.java index e32b068c..bfe7c8f4 100644 --- a/src/main/java/eu/siacs/conversations/ui/TimePreference.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/TimePreference.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.content.Context; import android.content.res.TypedArray; diff --git a/src/main/java/eu/siacs/conversations/ui/UiCallback.java b/src/main/java/de/thedevstack/conversationsplus/ui/UiCallback.java index c80199e1..0d23d29e 100644 --- a/src/main/java/eu/siacs/conversations/ui/UiCallback.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/UiCallback.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.app.PendingIntent; diff --git a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/VerifyOTRActivity.java index ec9d59e1..9f867dd2 100644 --- a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/VerifyOTRActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.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.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.utils.CryptoHelper; +import de.thedevstack.conversationsplus.utils.XmppUri; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; public class VerifyOTRActivity extends XmppActivity implements XmppConnectionService.OnConversationUpdate { diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java index 4157035b..8341e631 100644 --- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui; +package de.thedevstack.conversationsplus.ui; import android.annotation.SuppressLint; import android.annotation.TargetApi; @@ -64,21 +64,21 @@ import java.util.List; import java.util.concurrent.RejectedExecutionException; import de.tzur.conversations.Settings; -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.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.utils.ExceptionHelper; -import eu.siacs.conversations.xmpp.OnUpdateBlocklist; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.entities.MucOptions; +import de.thedevstack.conversationsplus.entities.Presences; +import de.thedevstack.conversationsplus.services.AvatarService; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.services.XmppConnectionService.XmppConnectionBinder; +import de.thedevstack.conversationsplus.utils.ExceptionHelper; +import de.thedevstack.conversationsplus.xmpp.OnUpdateBlocklist; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; public abstract class XmppActivity extends Activity { @@ -759,7 +759,7 @@ public abstract class XmppActivity extends Activity { public NdefMessage createNdefMessage(NfcEvent nfcEvent) { return new NdefMessage(new NdefRecord[]{ NdefRecord.createUri(getShareableUri()), - NdefRecord.createApplicationRecord("eu.siacs.conversations") + NdefRecord.createApplicationRecord("de.thedevstack.conversationsplus") }); } }, this); diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/AccountAdapter.java index 782a1231..08c9a0e1 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/AccountAdapter.java @@ -1,11 +1,11 @@ -package eu.siacs.conversations.ui.adapter; +package de.thedevstack.conversationsplus.ui.adapter; import java.util.List; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.ui.XmppActivity; -import eu.siacs.conversations.ui.ManageAccountActivity; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.ui.XmppActivity; +import de.thedevstack.conversationsplus.ui.ManageAccountActivity; import android.content.Context; import android.view.LayoutInflater; import android.view.View; diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java index c42dd305..123ae9a9 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui.adapter; +package de.thedevstack.conversationsplus.ui.adapter; import android.content.Context; import android.content.res.Resources; @@ -20,30 +20,17 @@ import java.util.List; import java.util.concurrent.RejectedExecutionException; import de.tzur.conversations.Settings; -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.Transferable; -import eu.siacs.conversations.entities.Message; -import eu.siacs.conversations.entities.Presences; -import eu.siacs.conversations.ui.ConversationActivity; -import eu.siacs.conversations.ui.XmppActivity; -import eu.siacs.conversations.utils.UIHelper; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.Transferable; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.entities.Presences; +import de.thedevstack.conversationsplus.ui.ConversationActivity; +import de.thedevstack.conversationsplus.ui.XmppActivity; +import de.thedevstack.conversationsplus.utils.UIHelper; import github.ankushsachdeva.emojicon.EmojiconTextView; -import android.content.Context; -import android.graphics.Color; -import android.graphics.Typeface; -import android.preference.PreferenceManager; -import android.util.Log; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ArrayAdapter; -import android.widget.ImageView; -import android.widget.TextView; - public class ConversationAdapter extends ArrayAdapter<Conversation> { private XmppActivity activity; @@ -226,4 +213,4 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> { return bitmapWorkerTaskReference.get(); } } -}
\ No newline at end of file +} diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/KnownHostsAdapter.java index 0993735f..7bca0aa6 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/KnownHostsAdapter.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.ui.adapter; +package de.thedevstack.conversationsplus.ui.adapter; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java index 4187ec60..114e5cff 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java @@ -1,15 +1,15 @@ -package eu.siacs.conversations.ui.adapter; +package de.thedevstack.conversationsplus.ui.adapter; import java.lang.ref.WeakReference; import java.util.List; import java.util.concurrent.RejectedExecutionException; import de.tzur.conversations.Settings; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.ListItem; -import eu.siacs.conversations.ui.XmppActivity; -import eu.siacs.conversations.utils.UIHelper; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.ListItem; +import de.thedevstack.conversationsplus.ui.XmppActivity; +import de.thedevstack.conversationsplus.utils.UIHelper; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; import android.content.Context; import android.content.SharedPreferences; diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java index b7ac3092..67391136 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java @@ -1,11 +1,10 @@ -package eu.siacs.conversations.ui.adapter; +package de.thedevstack.conversationsplus.ui.adapter; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.graphics.Typeface; import android.net.Uri; -import android.preference.PreferenceManager; import android.text.Spannable; import android.text.SpannableString; import android.text.Spanned; @@ -27,18 +26,18 @@ import android.widget.Toast; import java.util.List; import de.tzur.conversations.Settings; -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.Transferable; -import eu.siacs.conversations.entities.DownloadableFile; -import eu.siacs.conversations.entities.Message; -import eu.siacs.conversations.entities.Message.FileParams; -import eu.siacs.conversations.ui.ConversationActivity; -import eu.siacs.conversations.utils.GeoHelper; -import eu.siacs.conversations.utils.UIHelper; +import de.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.Transferable; +import de.thedevstack.conversationsplus.entities.DownloadableFile; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.entities.Message.FileParams; +import de.thedevstack.conversationsplus.ui.ConversationActivity; +import de.thedevstack.conversationsplus.utils.GeoHelper; +import de.thedevstack.conversationsplus.utils.UIHelper; import github.ankushsachdeva.emojicon.EmojiconTextView; public class MessageAdapter extends ArrayAdapter<Message> { diff --git a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java b/src/main/java/de/thedevstack/conversationsplus/utils/CryptoHelper.java index 2dec203d..9599aa37 100644 --- a/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java +++ b/src/main/java/de/thedevstack/conversationsplus/utils/CryptoHelper.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.thedevstack.conversationsplus.utils; import java.security.SecureRandom; import java.text.Normalizer; @@ -8,7 +8,7 @@ import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; -import eu.siacs.conversations.Config; +import de.thedevstack.conversationsplus.Config; 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/thedevstack/conversationsplus/utils/DNSHelper.java index 5a47bb3c..8951426f 100644 --- a/src/main/java/eu/siacs/conversations/utils/DNSHelper.java +++ b/src/main/java/de/thedevstack/conversationsplus/utils/DNSHelper.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.thedevstack.conversationsplus.utils; import de.measite.minidns.Client; import de.measite.minidns.DNSMessage; @@ -10,8 +10,8 @@ import de.measite.minidns.record.A; import de.measite.minidns.record.AAAA; import de.measite.minidns.record.Data; import de.measite.minidns.util.NameUtil; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; import java.io.IOException; import java.net.InetAddress; diff --git a/src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java b/src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHandler.java index 0ad57fe2..256287f1 100644 --- a/src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java +++ b/src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHandler.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.thedevstack.conversationsplus.utils; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java b/src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHelper.java index ee3ea3e1..492c65d2 100644 --- a/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java +++ b/src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHelper.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.thedevstack.conversationsplus.utils; import java.io.BufferedReader; import java.io.FileInputStream; @@ -6,14 +6,14 @@ import java.io.IOException; import java.io.InputStreamReader; 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.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; import android.app.AlertDialog; import android.content.Context; diff --git a/src/main/java/eu/siacs/conversations/utils/ExifHelper.java b/src/main/java/de/thedevstack/conversationsplus/utils/ExifHelper.java index ceda7293..13aff60d 100644 --- a/src/main/java/eu/siacs/conversations/utils/ExifHelper.java +++ b/src/main/java/de/thedevstack/conversationsplus/utils/ExifHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.siacs.conversations.utils; +package de.thedevstack.conversationsplus.utils; import android.util.Log; diff --git a/src/main/java/eu/siacs/conversations/utils/GeoHelper.java b/src/main/java/de/thedevstack/conversationsplus/utils/GeoHelper.java index 74f91a98..662f797a 100644 --- a/src/main/java/eu/siacs/conversations/utils/GeoHelper.java +++ b/src/main/java/de/thedevstack/conversationsplus/utils/GeoHelper.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.thedevstack.conversationsplus.utils; import android.content.Intent; import android.net.Uri; @@ -9,8 +9,8 @@ import java.util.ArrayList; import java.util.regex.Matcher; import java.util.regex.Pattern; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.entities.Message; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.Message; public class GeoHelper { private 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/thedevstack/conversationsplus/utils/MimeUtils.java index a9e89d1b..c1c40f92 100644 --- a/src/main/java/eu/siacs/conversations/utils/MimeUtils.java +++ b/src/main/java/de/thedevstack/conversationsplus/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.thedevstack.conversationsplus.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/thedevstack/conversationsplus/utils/OnPhoneContactsLoadedListener.java index 9a689768..e701d62b 100644 --- a/src/main/java/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java +++ b/src/main/java/de/thedevstack/conversationsplus/utils/OnPhoneContactsLoadedListener.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.thedevstack.conversationsplus.utils; import java.util.List; diff --git a/src/main/java/eu/siacs/conversations/utils/PRNGFixes.java b/src/main/java/de/thedevstack/conversationsplus/utils/PRNGFixes.java index 8fe67234..78776aeb 100644 --- a/src/main/java/eu/siacs/conversations/utils/PRNGFixes.java +++ b/src/main/java/de/thedevstack/conversationsplus/utils/PRNGFixes.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/utils/PhoneHelper.java index 99e8ebb8..b49e2183 100644 --- a/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java +++ b/src/main/java/de/thedevstack/conversationsplus/utils/PhoneHelper.java @@ -1,6 +1,5 @@ -package eu.siacs.conversations.utils; +package de.thedevstack.conversationsplus.utils; -import java.util.ArrayList; import java.util.List; import java.util.concurrent.RejectedExecutionException; diff --git a/src/main/java/eu/siacs/conversations/utils/SerialSingleThreadExecutor.java b/src/main/java/de/thedevstack/conversationsplus/utils/SerialSingleThreadExecutor.java index bfb4668d..264645c6 100644 --- a/src/main/java/eu/siacs/conversations/utils/SerialSingleThreadExecutor.java +++ b/src/main/java/de/thedevstack/conversationsplus/utils/SerialSingleThreadExecutor.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.thedevstack.conversationsplus.utils; import java.util.ArrayDeque; import java.util.Queue; @@ -31,4 +31,4 @@ public class SerialSingleThreadExecutor implements Executor { executor.execute(active); } } -}
\ No newline at end of file +} diff --git a/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java index de669ea6..0e7833e4 100644 --- a/src/main/java/eu/siacs/conversations/utils/UIHelper.java +++ b/src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.thedevstack.conversationsplus.utils; import java.util.ArrayList; import java.util.Arrays; @@ -6,21 +6,19 @@ import java.net.URLConnection; import java.util.Calendar; import java.util.Date; import java.util.HashMap; -import java.util.List; -import java.util.Locale; import java.util.Map; import java.util.Map.Entry; import java.util.regex.Pattern; import java.util.regex.Matcher; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -import eu.siacs.conversations.entities.Contact; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.entities.Presences; -import eu.siacs.conversations.entities.Transferable; -import eu.siacs.conversations.entities.Message; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.entities.Contact; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.Presences; +import de.thedevstack.conversationsplus.entities.Transferable; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; import android.content.Context; import android.text.format.DateFormat; diff --git a/src/main/java/eu/siacs/conversations/utils/XmlHelper.java b/src/main/java/de/thedevstack/conversationsplus/utils/XmlHelper.java index 4dee07cf..1287f73f 100644 --- a/src/main/java/eu/siacs/conversations/utils/XmlHelper.java +++ b/src/main/java/de/thedevstack/conversationsplus/utils/XmlHelper.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.utils; +package de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/utils/Xmlns.java index 868566d9..6e3cc912 100644 --- a/src/main/java/eu/siacs/conversations/utils/Xmlns.java +++ b/src/main/java/de/thedevstack/conversationsplus/utils/Xmlns.java @@ -1,9 +1,9 @@ -package eu.siacs.conversations.utils; +package de.thedevstack.conversationsplus.utils; public final class Xmlns { public static final String BLOCKING = "urn:xmpp:blocking"; public static final String ROSTER = "jabber:iq:roster"; public static final String REGISTER = "jabber:iq:register"; public static final String BYTE_STREAMS = "http://jabber.org/protocol/bytestreams"; - public static final String HTTP_UPLOAD = "eu:siacs:conversations:http:upload"; + public static final String HTTP_UPLOAD = "de:thedevstack:conversationsplus:http:upload"; } diff --git a/src/main/java/eu/siacs/conversations/utils/XmppUri.java b/src/main/java/de/thedevstack/conversationsplus/utils/XmppUri.java index 92c0241e..5d3a2694 100644 --- a/src/main/java/eu/siacs/conversations/utils/XmppUri.java +++ b/src/main/java/de/thedevstack/conversationsplus/utils/XmppUri.java @@ -1,12 +1,12 @@ -package eu.siacs.conversations.utils; +package de.thedevstack.conversationsplus.utils; import android.net.Uri; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; public class XmppUri { diff --git a/src/main/java/eu/siacs/conversations/xml/Element.java b/src/main/java/de/thedevstack/conversationsplus/xml/Element.java index 32657c66..ca5d70cb 100644 --- a/src/main/java/eu/siacs/conversations/xml/Element.java +++ b/src/main/java/de/thedevstack/conversationsplus/xml/Element.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xml; +package de.thedevstack.conversationsplus.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.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.utils.XmlHelper; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; public class Element { protected String name; diff --git a/src/main/java/eu/siacs/conversations/xml/Tag.java b/src/main/java/de/thedevstack/conversationsplus/xml/Tag.java index b9ef979f..84e37363 100644 --- a/src/main/java/eu/siacs/conversations/xml/Tag.java +++ b/src/main/java/de/thedevstack/conversationsplus/xml/Tag.java @@ -1,11 +1,11 @@ -package eu.siacs.conversations.xml; +package de.thedevstack.conversationsplus.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.thedevstack.conversationsplus.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/thedevstack/conversationsplus/xml/TagWriter.java index f11c1846..c0f028af 100644 --- a/src/main/java/eu/siacs/conversations/xml/TagWriter.java +++ b/src/main/java/de/thedevstack/conversationsplus/xml/TagWriter.java @@ -1,11 +1,11 @@ -package eu.siacs.conversations.xml; +package de.thedevstack.conversationsplus.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.thedevstack.conversationsplus.xmpp.stanzas.AbstractStanza; public class TagWriter { diff --git a/src/main/java/eu/siacs/conversations/xml/XmlReader.java b/src/main/java/de/thedevstack/conversationsplus/xml/XmlReader.java index 52d3d46a..d7f6edf5 100644 --- a/src/main/java/eu/siacs/conversations/xml/XmlReader.java +++ b/src/main/java/de/thedevstack/conversationsplus/xml/XmlReader.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xml; +package de.thedevstack.conversationsplus.xml; import java.io.IOException; import java.io.InputStream; @@ -7,7 +7,7 @@ import java.io.InputStreamReader; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; -import eu.siacs.conversations.Config; +import de.thedevstack.conversationsplus.Config; import android.os.PowerManager; import android.os.PowerManager.WakeLock; diff --git a/src/main/java/eu/siacs/conversations/xmpp/OnAdvancedStreamFeaturesLoaded.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/OnAdvancedStreamFeaturesLoaded.java index e45eba73..0692232c 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/OnAdvancedStreamFeaturesLoaded.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/OnAdvancedStreamFeaturesLoaded.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp; +package de.thedevstack.conversationsplus.xmpp; -import eu.siacs.conversations.entities.Account; +import de.thedevstack.conversationsplus.entities.Account; public interface OnAdvancedStreamFeaturesLoaded { public void onAdvancedStreamFeaturesAvailable(final Account account); diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/OnBindListener.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/OnBindListener.java new file mode 100644 index 00000000..274511e0 --- /dev/null +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/OnBindListener.java @@ -0,0 +1,7 @@ +package de.thedevstack.conversationsplus.xmpp; + +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/xmpp/OnContactStatusChanged.java index 20b17f02..009b33df 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/OnContactStatusChanged.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/OnContactStatusChanged.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp; +package de.thedevstack.conversationsplus.xmpp; -import eu.siacs.conversations.entities.Contact; +import de.thedevstack.conversationsplus.entities.Contact; public interface OnContactStatusChanged { public void onContactStatusChanged(final Contact contact, final boolean online); diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/OnIqPacketReceived.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/OnIqPacketReceived.java new file mode 100644 index 00000000..df0178c6 --- /dev/null +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/OnIqPacketReceived.java @@ -0,0 +1,8 @@ +package de.thedevstack.conversationsplus.xmpp; + +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.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/OnMessageAcknowledged.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/OnMessageAcknowledged.java index 5f670d93..7cfa557d 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/OnMessageAcknowledged.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/OnMessageAcknowledged.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp; +package de.thedevstack.conversationsplus.xmpp; -import eu.siacs.conversations.entities.Account; +import de.thedevstack.conversationsplus.entities.Account; public interface OnMessageAcknowledged { public void onMessageAcknowledged(Account account, String id); diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/OnMessagePacketReceived.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/OnMessagePacketReceived.java new file mode 100644 index 00000000..47649a18 --- /dev/null +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/OnMessagePacketReceived.java @@ -0,0 +1,8 @@ +package de.thedevstack.conversationsplus.xmpp; + +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.xmpp.stanzas.MessagePacket; + +public interface OnMessagePacketReceived extends PacketReceived { + public void onMessagePacketReceived(Account account, MessagePacket packet); +} diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/OnPresencePacketReceived.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/OnPresencePacketReceived.java new file mode 100644 index 00000000..70b0ccd2 --- /dev/null +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/OnPresencePacketReceived.java @@ -0,0 +1,8 @@ +package de.thedevstack.conversationsplus.xmpp; + +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.xmpp.stanzas.PresencePacket; + +public interface OnPresencePacketReceived extends PacketReceived { + public void onPresencePacketReceived(Account account, PresencePacket packet); +} diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/OnStatusChanged.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/OnStatusChanged.java new file mode 100644 index 00000000..c8478bbb --- /dev/null +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/OnStatusChanged.java @@ -0,0 +1,7 @@ +package de.thedevstack.conversationsplus.xmpp; + +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/xmpp/OnUpdateBlocklist.java index 92e72cfa..ea7b8c62 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/OnUpdateBlocklist.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/OnUpdateBlocklist.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp; +package de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/xmpp/PacketReceived.java index d4502d73..6274aaa2 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/PacketReceived.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/PacketReceived.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp; +package de.thedevstack.conversationsplus.xmpp; public abstract interface PacketReceived { diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/XmppConnection.java index 35c89b45..1687ef4b 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/XmppConnection.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp; +package de.thedevstack.conversationsplus.xmpp; import android.content.Context; import android.content.SharedPreferences; @@ -46,35 +46,35 @@ import javax.net.ssl.SSLSocket; import javax.net.ssl.SSLSocketFactory; import javax.net.ssl.X509TrustManager; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.crypto.sasl.DigestMd5; -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.generator.IqGenerator; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.utils.CryptoHelper; -import eu.siacs.conversations.utils.DNSHelper; -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.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.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.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.crypto.sasl.DigestMd5; +import de.thedevstack.conversationsplus.crypto.sasl.Plain; +import de.thedevstack.conversationsplus.crypto.sasl.SaslMechanism; +import de.thedevstack.conversationsplus.crypto.sasl.ScramSha1; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.generator.IqGenerator; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.utils.CryptoHelper; +import de.thedevstack.conversationsplus.utils.DNSHelper; +import de.thedevstack.conversationsplus.utils.Xmlns; +import de.thedevstack.conversationsplus.xml.Element; +import de.thedevstack.conversationsplus.xml.Tag; +import de.thedevstack.conversationsplus.xml.TagWriter; +import de.thedevstack.conversationsplus.xml.XmlReader; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.jingle.OnJinglePacketReceived; +import de.thedevstack.conversationsplus.xmpp.jingle.stanzas.JinglePacket; +import de.thedevstack.conversationsplus.xmpp.stanzas.AbstractStanza; +import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket; +import de.thedevstack.conversationsplus.xmpp.stanzas.MessagePacket; +import de.thedevstack.conversationsplus.xmpp.stanzas.PresencePacket; +import de.thedevstack.conversationsplus.xmpp.stanzas.csi.ActivePacket; +import de.thedevstack.conversationsplus.xmpp.stanzas.csi.InactivePacket; +import de.thedevstack.conversationsplus.xmpp.stanzas.streammgmt.AckPacket; +import de.thedevstack.conversationsplus.xmpp.stanzas.streammgmt.EnablePacket; +import de.thedevstack.conversationsplus.xmpp.stanzas.streammgmt.RequestPacket; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/xmpp/chatstate/ChatState.java index f85efbdb..929d485a 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/chatstate/ChatState.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/chatstate/ChatState.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.chatstate; +package de.thedevstack.conversationsplus.xmpp.chatstate; -import eu.siacs.conversations.xml.Element; +import de.thedevstack.conversationsplus.xml.Element; public enum ChatState { diff --git a/src/main/java/eu/siacs/conversations/xmpp/forms/Data.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/forms/Data.java index 44794c80..591d8ada 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/forms/Data.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/forms/Data.java @@ -1,11 +1,11 @@ -package eu.siacs.conversations.xmpp.forms; +package de.thedevstack.conversationsplus.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.thedevstack.conversationsplus.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/thedevstack/conversationsplus/xmpp/forms/Field.java index ee2c51a9..9eb2d08d 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/forms/Field.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/forms/Field.java @@ -1,9 +1,9 @@ -package eu.siacs.conversations.xmpp.forms; +package de.thedevstack.conversationsplus.xmpp.forms; import java.util.Collection; import java.util.Iterator; -import eu.siacs.conversations.xml.Element; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/xmpp/jid/InvalidJidException.java index 164e8849..3c8dd717 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jid/InvalidJidException.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jid/InvalidJidException.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp.jid; +package de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/xmpp/jid/Jid.java index f989c0c2..5aaf1563 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jid/Jid.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jid/Jid.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp.jid; +package de.thedevstack.conversationsplus.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.thedevstack.conversationsplus.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/thedevstack/conversationsplus/xmpp/jingle/JingleCandidate.java index dcadb92f..bf282293 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleCandidate.java @@ -1,10 +1,10 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.thedevstack.conversationsplus.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.thedevstack.conversationsplus.xml.Element; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; public class JingleCandidate { diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java index 2c56488d..7b7aefee 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.thedevstack.conversationsplus.xmpp.jingle; import java.util.ArrayList; import java.util.Arrays; @@ -12,21 +12,21 @@ import android.content.Intent; import android.net.Uri; import android.os.SystemClock; import android.util.Log; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.entities.Transferable; -import eu.siacs.conversations.entities.DownloadableFile; -import eu.siacs.conversations.entities.TransferablePlaceholder; -import eu.siacs.conversations.entities.Message; -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.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Conversation; +import de.thedevstack.conversationsplus.entities.Transferable; +import de.thedevstack.conversationsplus.entities.DownloadableFile; +import de.thedevstack.conversationsplus.entities.TransferablePlaceholder; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.xml.Element; +import de.thedevstack.conversationsplus.xmpp.OnIqPacketReceived; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.jingle.stanzas.Content; +import de.thedevstack.conversationsplus.xmpp.jingle.stanzas.JinglePacket; +import de.thedevstack.conversationsplus.xmpp.jingle.stanzas.Reason; +import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket; public class JingleConnection implements Transferable { diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java index cadf9df3..8c2a9216 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.thedevstack.conversationsplus.xmpp.jingle; import java.math.BigInteger; import java.security.SecureRandom; @@ -7,18 +7,19 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import android.annotation.SuppressLint; import android.util.Log; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Transferable; -import eu.siacs.conversations.entities.Message; -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.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.Transferable; +import de.thedevstack.conversationsplus.entities.Message; +import de.thedevstack.conversationsplus.services.AbstractConnectionManager; +import de.thedevstack.conversationsplus.services.XmppConnectionService; +import de.thedevstack.conversationsplus.utils.Xmlns; +import de.thedevstack.conversationsplus.xml.Element; +import de.thedevstack.conversationsplus.xmpp.OnIqPacketReceived; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.jingle.stanzas.JinglePacket; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/xmpp/jingle/JingleInbandTransport.java index 9a02ee7a..08b63d5b 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleInbandTransport.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.thedevstack.conversationsplus.xmpp.jingle; import java.io.IOException; import java.io.InputStream; @@ -10,15 +10,15 @@ import java.util.Arrays; import android.util.Base64; import android.util.Log; -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.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.entities.DownloadableFile; +import de.thedevstack.conversationsplus.persistance.FileBackend; +import de.thedevstack.conversationsplus.utils.CryptoHelper; +import de.thedevstack.conversationsplus.xml.Element; +import de.thedevstack.conversationsplus.xmpp.OnIqPacketReceived; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java index 8d74f44e..2e2ba4fe 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.thedevstack.conversationsplus.xmpp.jingle; import android.util.Log; @@ -14,10 +14,10 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.entities.DownloadableFile; -import eu.siacs.conversations.persistance.FileBackend; -import eu.siacs.conversations.utils.CryptoHelper; +import de.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.entities.DownloadableFile; +import de.thedevstack.conversationsplus.persistance.FileBackend; +import de.thedevstack.conversationsplus.utils.CryptoHelper; 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/thedevstack/conversationsplus/xmpp/jingle/JingleTransport.java index e832d3f5..ee0fefff 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleTransport.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleTransport.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.thedevstack.conversationsplus.xmpp.jingle; -import eu.siacs.conversations.entities.DownloadableFile; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/xmpp/jingle/OnFileTransmissionStatusChanged.java index e45e7441..86daae81 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/OnFileTransmissionStatusChanged.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.thedevstack.conversationsplus.xmpp.jingle; -import eu.siacs.conversations.entities.DownloadableFile; +import de.thedevstack.conversationsplus.entities.DownloadableFile; public interface OnFileTransmissionStatusChanged { public void onFileTransmitted(DownloadableFile file); diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/OnJinglePacketReceived.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/OnJinglePacketReceived.java new file mode 100644 index 00000000..d6dda138 --- /dev/null +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/OnJinglePacketReceived.java @@ -0,0 +1,9 @@ +package de.thedevstack.conversationsplus.xmpp.jingle; + +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.xmpp.PacketReceived; +import de.thedevstack.conversationsplus.xmpp.jingle.stanzas.JinglePacket; + +public interface OnJinglePacketReceived extends PacketReceived { + public void onJinglePacketReceived(Account account, JinglePacket packet); +} diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/OnPrimaryCandidateFound.java index 03a437b2..be1f1d02 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/OnPrimaryCandidateFound.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.thedevstack.conversationsplus.xmpp.jingle; public interface OnPrimaryCandidateFound { public void onPrimaryCandidateFound(boolean success, diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/OnTransportConnected.java index 38f03c5d..91a79a83 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/OnTransportConnected.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/xmpp/jingle/stanzas/Content.java index bcadbe77..40eec6f1 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/stanzas/Content.java @@ -1,7 +1,7 @@ -package eu.siacs.conversations.xmpp.jingle.stanzas; +package de.thedevstack.conversationsplus.xmpp.jingle.stanzas; -import eu.siacs.conversations.entities.DownloadableFile; -import eu.siacs.conversations.xml.Element; +import de.thedevstack.conversationsplus.entities.DownloadableFile; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/xmpp/jingle/stanzas/JinglePacket.java index 4f73a83a..db771a0a 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/stanzas/JinglePacket.java @@ -1,8 +1,8 @@ -package eu.siacs.conversations.xmpp.jingle.stanzas; +package de.thedevstack.conversationsplus.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.thedevstack.conversationsplus.xml.Element; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/xmpp/jingle/stanzas/Reason.java index 610d5e76..a442d8d3 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/stanzas/Reason.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.jingle.stanzas; +package de.thedevstack.conversationsplus.xmpp.jingle.stanzas; -import eu.siacs.conversations.xml.Element; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/xmpp/pep/Avatar.java index 74da6a9b..31fda8fd 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/pep/Avatar.java @@ -1,7 +1,7 @@ -package eu.siacs.conversations.xmpp.pep; +package de.thedevstack.conversationsplus.xmpp.pep; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xml.Element; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; import android.util.Base64; diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/AbstractStanza.java index bd706b57..dff5b58d 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/AbstractStanza.java @@ -1,8 +1,8 @@ -package eu.siacs.conversations.xmpp.stanzas; +package de.thedevstack.conversationsplus.xmpp.stanzas; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.entities.Account; +import de.thedevstack.conversationsplus.xml.Element; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/xmpp/stanzas/IqPacket.java index 7b36fc49..fb08556b 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/IqPacket.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.stanzas; +package de.thedevstack.conversationsplus.xmpp.stanzas; -import eu.siacs.conversations.xml.Element; +import de.thedevstack.conversationsplus.xml.Element; public class IqPacket extends AbstractStanza { diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/MessagePacket.java index e32811af..638ba5f4 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/MessagePacket.java @@ -1,11 +1,11 @@ -package eu.siacs.conversations.xmpp.stanzas; +package de.thedevstack.conversationsplus.xmpp.stanzas; import android.util.Pair; import java.text.ParseException; -import eu.siacs.conversations.parser.AbstractParser; -import eu.siacs.conversations.xml.Element; +import de.thedevstack.conversationsplus.parser.AbstractParser; +import de.thedevstack.conversationsplus.xml.Element; public class MessagePacket extends AbstractStanza { 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/thedevstack/conversationsplus/xmpp/stanzas/PresencePacket.java index 7ea32099..dfe40f87 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/PresencePacket.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp.stanzas; +package de.thedevstack.conversationsplus.xmpp.stanzas; public class PresencePacket extends AbstractStanza { diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/csi/ActivePacket.java index 78ab66d8..47538a64 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/csi/ActivePacket.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.stanzas.csi; +package de.thedevstack.conversationsplus.xmpp.stanzas.csi; -import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/xmpp/stanzas/csi/InactivePacket.java index f109280f..ca5904a5 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/csi/InactivePacket.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.stanzas.csi; +package de.thedevstack.conversationsplus.xmpp.stanzas.csi; -import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/xmpp/stanzas/streammgmt/AckPacket.java index f93b5d87..fe1740da 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/streammgmt/AckPacket.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.stanzas.streammgmt; +package de.thedevstack.conversationsplus.xmpp.stanzas.streammgmt; -import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/xmpp/stanzas/streammgmt/EnablePacket.java index 78cd81ed..ce416f27 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/streammgmt/EnablePacket.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.stanzas.streammgmt; +package de.thedevstack.conversationsplus.xmpp.stanzas.streammgmt; -import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/xmpp/stanzas/streammgmt/RequestPacket.java index 98cfc748..eb6217ae 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/streammgmt/RequestPacket.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.stanzas.streammgmt; +package de.thedevstack.conversationsplus.xmpp.stanzas.streammgmt; -import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; +import de.thedevstack.conversationsplus.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/thedevstack/conversationsplus/xmpp/stanzas/streammgmt/ResumePacket.java index 9cdcfa5e..90bf566e 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java +++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/streammgmt/ResumePacket.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.stanzas.streammgmt; +package de.thedevstack.conversationsplus.xmpp.stanzas.streammgmt; -import eu.siacs.conversations.xmpp.stanzas.AbstractStanza; +import de.thedevstack.conversationsplus.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 f09cf33d..00000000 --- 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 a4cff986..00000000 --- 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/OnMessagePacketReceived.java b/src/main/java/eu/siacs/conversations/xmpp/OnMessagePacketReceived.java deleted file mode 100644 index 325e945f..00000000 --- a/src/main/java/eu/siacs/conversations/xmpp/OnMessagePacketReceived.java +++ /dev/null @@ -1,8 +0,0 @@ -package eu.siacs.conversations.xmpp; - -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.xmpp.stanzas.MessagePacket; - -public interface OnMessagePacketReceived extends PacketReceived { - public void onMessagePacketReceived(Account account, MessagePacket packet); -} diff --git a/src/main/java/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java b/src/main/java/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java deleted file mode 100644 index 95c1acfc..00000000 --- a/src/main/java/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java +++ /dev/null @@ -1,8 +0,0 @@ -package eu.siacs.conversations.xmpp; - -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.xmpp.stanzas.PresencePacket; - -public interface OnPresencePacketReceived extends PacketReceived { - public void onPresencePacketReceived(Account account, PresencePacket packet); -} diff --git a/src/main/java/eu/siacs/conversations/xmpp/OnStatusChanged.java b/src/main/java/eu/siacs/conversations/xmpp/OnStatusChanged.java deleted file mode 100644 index ad1d98cb..00000000 --- a/src/main/java/eu/siacs/conversations/xmpp/OnStatusChanged.java +++ /dev/null @@ -1,7 +0,0 @@ -package eu.siacs.conversations.xmpp; - -import eu.siacs.conversations.entities.Account; - -public interface OnStatusChanged { - public void onStatusChanged(Account account); -} 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 2aaf62a1..00000000 --- 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 { - public void onJinglePacketReceived(Account account, JinglePacket packet); -} diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml index d7d23f0f..faaafcfd 100644 --- a/src/main/res/layout/activity_about.xml +++ b/src/main/res/layout/activity_about.xml @@ -1,6 +1,6 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - tools:context="eu.siacs.conversations.ui.AboutActivity" + tools:context="de.thedevstack.conversationsplus.ui.AboutActivity" android:background="@color/grey50" android:layout_width="fill_parent" android:layout_height="fill_parent"> diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index 3fd80aa2..bb706e5b 100644 --- a/src/main/res/layout/fragment_conversation.xml +++ b/src/main/res/layout/fragment_conversation.xml @@ -29,7 +29,7 @@ android:layout_alignParentLeft="true" android:background="@color/grey50" > - <eu.siacs.conversations.ui.EditMessage + <de.thedevstack.conversationsplus.ui.EditMessage android:id="@+id/textinput" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -48,7 +48,7 @@ android:textColor="@color/black87" > <requestFocus /> - </eu.siacs.conversations.ui.EditMessage> + </de.thedevstack.conversationsplus.ui.EditMessage> <ImageButton android:id="@+id/textSendButton" diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 94d75164..77e7d23e 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name" translatable="false">Conversations</string> + <string name="app_name" translatable="false">Conversations+</string> <string name="action_settings">Settings</string> <string name="action_add">New conversation</string> <string name="action_accounts">Manage accounts</string> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 9def87c4..470cef97 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -80,13 +80,13 @@ android:key="enable_quiet_hours" android:summary="@string/pref_quiet_hours_summary" android:title="@string/title_pref_enable_quiet_hours" /> - <eu.siacs.conversations.ui.TimePreference + <de.thedevstack.conversationsplus.ui.TimePreference android:dependency="enable_quiet_hours" android:key="quiet_hours_start" android:negativeButtonText="@string/cancel" android:positiveButtonText="@string/set" android:title="@string/title_pref_quiet_hours_start_time" /> - <eu.siacs.conversations.ui.TimePreference + <de.thedevstack.conversationsplus.ui.TimePreference android:dependency="enable_quiet_hours" android:key="quiet_hours_end" android:negativeButtonText="@string/cancel" @@ -215,7 +215,7 @@ android:summary="@string/pref_never_send_crash_summary" android:title="@string/pref_never_send_crash" /> </PreferenceCategory> - <eu.siacs.conversations.ui.AboutPreference + <de.thedevstack.conversationsplus.ui.AboutPreference android:summary="@string/pref_about_conversations_summary" android:title="@string/title_activity_about" /> </PreferenceScreen> |