| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |
| |
| |
| | |
XmppConnectionService.attachLocationToConversation moved to ConversationUtil
|
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
|
| |
| |
| |
| |
| |
| |
| | |
- Implementing the FileObserver in a separate class, with mask to watch only deletions not everything
- Add observation of all directories which could contain a sent/received file
- Change observers if the folder names are changed via settings
- markMessage method moved from XmppConnectionService to MessageUtil
|
| |\
| | |
| | |
| | |
| | |
| | | |
Conflicts:
gradle/wrapper/gradle-wrapper.properties
src/main/res/values/strings.xml
|
| | |
| | |
| | |
| | | |
moved Config.java parameters to a flavorable configuration file
|
| | |\
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
build.gradle
src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java
src/main/res/values-bg/strings.xml
src/main/res/values-cs/strings.xml
src/main/res/values-fr/strings.xml
src/main/res/values-ja/strings.xml
src/main/res/values-nl/strings.xml
src/main/res/values-pt/strings.xml
src/main/res/values-ro-rRO/strings.xml
src/main/res/values-sv/strings.xml
src/main/res/values-zh-rCN/strings.xml
src/main/res/values/strings.xml
|
| |/
| |
| |
| |
| |
| |
| | |
Conversations+ Database version
HttpUpload Flag introduced for message to identify if a link was sent after httpupload
message hint for httpupload added (message parsing and message generating)
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
README.md
build.gradle
gradle/wrapper/gradle-wrapper.properties
src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
src/main/java/eu/siacs/conversations/persistance/FileBackend.java
src/main/java/eu/siacs/conversations/services/AvatarService.java
src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java
src/main/java/eu/siacs/conversations/services/NotificationService.java
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
src/main/res/values-cs/strings.xml
src/main/res/values-de/strings.xml
src/main/res/values-es/strings.xml
src/main/res/values-fr/strings.xml
src/main/res/values-it/strings.xml
src/main/res/values-pt-rBR/strings.xml
src/main/res/values-zh-rCN/strings.xml
src/main/res/values/strings.xml
src/main/res/xml/preferences.xml
|
|\|
| |
| |
| |
| | |
Conflicts:
src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java
|
| | |
|
| |\
| |/
|/| |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
|
| | |
|
| | |
|
| |\
| |/
|/| |
|
| | |
|
| |\
| |/
|/| |
|
| |\
| |/
|/| |
|
|\| |
|
| | |
|
| |\
| |/
|/| |
|
|\|
| |
| |
| |
| | |
Conflicts:
src/main/java/eu/siacs/conversations/entities/Message.java
|
| | |
|
| |\
| |/
|/| |
|
| |\
| |/
|/| |
|
| |\ |
|
| |\ \ |
|
| |_|/
|/| | |
|
| |/
|/| |
|
| |
| |
| |
| | |
XmppConnectionService marked as deprecated
|
| | |
|
| | |
|
| | |
|
|\| |
|
| |
| |
| |
| |
| |
| |
| | |
- fetchAvatar, fetchAvatarPep, fetchAvatarVcard, checkForAvatar moved from XmppConnectionService to AvatarService
- Several unused imports removed
- XmppSendUtil introduced to enable presencePacket and iqPacket sending without using XmppConnectionService since the account has everything needed
- UiUpdateHelper introduced to enable UI updates without using XmppConnectionService directly
|
| |
| |
| |
| | |
Value of namespace constant changed to 'urn:xmpp:http:upload'
|
|\| |
|
| |
| |
| |
| | |
distinguishes between image resizing and compressing/saving
|
| | |
|
|\| |
|
| | |
|
| | |
|
|\| |
|
| |
| |
| |
| | |
nce.thedevstack.de
|
| |
| |
| |
| | |
activity to show logcat output and button to copy contents
|
|\| |
|
| |
| |
| |
| | |
AvatarUtil, StreamUtil, ImageUtil. Unused imports removed.
|
|/ |
|
|
|
|
| |
picture or not
|