fb00372269
Merge tag '1.11.1' into trz/merge_1.11.1
...
Conflicts:
README.md
build.gradle
src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
src/main/java/eu/siacs/conversations/utils/FileUtils.java
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
src/main/res/values-de/strings.xml
src/main/res/values-eu/strings.xml
src/main/res/values-ja/strings.xml
src/main/res/values-ru/strings.xml
2016-03-17 15:56:54 +01:00
0de9c2aa23
partially implements FS#161
...
do not show download button on 404
2016-03-16 18:45:18 +01:00
Daniel Gultsch
c4b1f6171d
version bump to 1.11.1 and changelog
2016-03-16 18:12:36 +01:00
Daniel Gultsch
b17ca3543f
made it possible to share text files
2016-03-16 18:09:19 +01:00
Daniel Gultsch
48be5af55f
reworked sharewith activity to stay open during sharing
...
closing the activity prematuraly caused uri permissions to be revoked
2016-03-16 10:46:33 +01:00
Daniel Gultsch
323d31ba05
Merge pull request #1767 from fiaxh/path_file_accessible
...
Check if path for URI is accessible
2016-03-16 10:44:13 +01:00
fiaxh
eaddfa7fd1
Check if path for URI is accessible
...
The path extracted from the Cursor might not be accessible for Conversations. FileUtils accesses URI information through the ContentProvider, so this wouldn't be noticed.
Fixes sharing from open-keychain's TemporaryContentProvider
2016-03-15 11:42:13 +01:00
25d3aba4d7
Merge branch 'trz/rename' into trz/rebase
2016-03-15 09:18:03 +01:00
76a1937745
once again: FS#34 - review all calls for String.trim()
2016-03-14 23:39:44 +01:00
Daniel Gultsch
678bc7b4d4
removed requirement of external component for http upload
2016-03-14 12:16:36 +01:00
Daniel Gultsch
815c534da8
pulled translations from transifex
2016-03-13 17:43:43 +01:00
Daniel Gultsch
0af8ee341c
simplified getUsers(max) code
2016-03-13 17:42:17 +01:00
Daniel Gultsch
1153e6120d
added logging in case fragment wasn't attached
2016-03-13 17:41:38 +01:00
Daniel Gultsch
290f53f4a6
fixed recursive call instead of call to super in PublishProfileActivity
2016-03-13 17:39:13 +01:00
steckbrief
74582979b3
Refs FS#140: Rework message display
...
hide own avatar in message display
2016-03-13 16:25:19 +01:00
steckbrief
340272ba84
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
2016-03-12 21:22:44 +01:00
steckbrief
86afdc7aaf
Merge commit 'remotes/origin/trz/rename~1' into trz/rebase
2016-03-12 21:21:32 +01:00
steckbrief
a95d2d9134
Fixes FS#155: Check FileHelper vs. FileUtils
2016-03-12 21:14:55 +01:00
14c2c72bc1
Merge branch 'trz/rebase' into trz/rename
2016-03-12 15:51:17 +01:00
2a486c667a
Merge branch 'trz/rebase' (early part) into trz/rename
2016-03-12 15:46:09 +01:00
dc26c95b40
fixed possible NPE
2016-03-12 15:36:54 +01:00
3dc635c6fd
small bugfixes
2016-03-12 15:04:07 +01:00
e72f409197
removed duplicated source
2016-03-12 14:15:39 +01:00
bf49abe865
Added method to get body from message if hasMeCommand and harmonized extraction of fileextension (FS#38)
2016-03-12 02:28:22 +01:00
steckbrief
3041cc74ce
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
...
Conflicts:
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
src/main/java/eu/siacs/conversations/ui/widget/Switch.java
src/main/res/layout/account_row.xml
src/main/res/layout/contact_key.xml
2016-03-11 23:51:10 +01:00
steckbrief
a444402644
Fixes FS#51: Change toggle in Account Management back to standard
2016-03-11 23:44:59 +01:00
steckbrief
864bb77883
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
...
Conflicts:
src/main/java/eu/siacs/conversations/entities/Message.java
2016-03-11 21:34:10 +01:00
steckbrief
bfc5000b6a
Fixes FS#139: Do not merge messages at all
2016-03-11 21:31:30 +01:00
Daniel Gultsch
817d344521
log reason for bind failure
2016-03-11 09:01:40 +01:00
Daniel Gultsch
9548f43998
close cursor in caps db query
2016-03-11 09:01:27 +01:00
steckbrief
8585231be2
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
...
Conflicts:
src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
2016-03-10 23:03:19 +01:00
steckbrief
27c9c0aa21
Fixes FS#157: Trigger loading messages from MAM in MUC does not end
2016-03-10 22:54:13 +01:00
steckbrief
58ddfef266
Fixes FS#158: user decision dialog heading configurable and translateable
2016-03-10 21:13:59 +01:00
Daniel Gultsch
7eb736227e
mention mod_smacks_offline and ejabberds settings in readme
2016-03-10 14:47:55 +01:00
steckbrief
07c2aba59b
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
...
Conflicts:
build.gradle
2016-03-08 23:35:59 +01:00
steckbrief
9af0794911
Merge remote branch 'master'
2016-03-08 23:22:36 +01:00
steckbrief
a5243a8160
Fixes FS#145: Dialog for decision in Android 5
2016-03-08 23:15:05 +01:00
85bb3f537a
incremented version code
2016-03-08 22:47:54 +01:00
a6442dd3ac
Merge branch 'trz/rename' into trz/rebase
2016-03-08 22:24:47 +01:00
b0e651aa93
Merge branch 'trz/rename' (early part) into trz/rebase
2016-03-08 22:24:21 +01:00
steckbrief
4b4ba6cff8
reset link and highlight colors to system default
2016-03-08 22:13:52 +01:00
74d6d10cb7
Merge branch 'trz/rebase' into trz/rename
2016-03-08 21:13:24 +01:00
f051dd0bcd
Fixes FS#153 - Check if url, phone and email are linkified correctly
2016-03-08 20:36:41 +01:00
steckbrief
d80e433e42
Use ImageUtil instead of old stupid generic FileBackend for cropCenterSquare
2016-03-08 12:56:02 +01:00
steckbrief
48f3922fe6
Fixed merge issue with AxolotlService (differentiation between impl and interface)
2016-03-08 12:55:03 +01:00
2b86b686c5
Merge tag '1.11.0' into trz/merge_1.11.0
...
Conflicts:
README.md
build.gradle
src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
src/main/java/eu/siacs/conversations/entities/Conversation.java
src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
src/main/java/eu/siacs/conversations/parser/MessageParser.java
src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
src/main/java/eu/siacs/conversations/ui/ConversationFragment.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/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/res/values-bg/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-nl/strings.xml
src/main/res/values-pl/strings.xml
src/main/res/values-ro-rRO/strings.xml
src/main/res/values-sr/strings.xml
src/main/res/values-sv/strings.xml
src/main/res/values-tr-rTR/strings.xml
src/main/res/values-zh-rCN/strings.xml
src/main/res/values/strings.xml
2016-03-08 10:49:47 +01:00
7be757de90
Merge branch 'trz/rebase' into trz/rename
2016-03-08 01:01:33 +01:00
f767a06842
use Build.VERSION_CODES.KITKAT instead of hard coded 19
2016-03-08 00:58:30 +01:00
5eda297b14
Merge branch 'trz/rebase' into trz/rename
2016-03-07 23:42:13 +01:00
c8759af913
Fixes FS#151 - Missing button on image-links
2016-03-07 23:39:41 +01:00
