diff options
author | steckbrief <steckbrief@chefmail.de> | 2016-03-12 21:22:44 +0100 |
---|---|---|
committer | steckbrief <steckbrief@chefmail.de> | 2016-03-12 21:22:44 +0100 |
commit | 340272ba841be12dcdf1317e183a45d8b46dce44 (patch) | |
tree | 4c4cf2121ccfdb1da3ab2825f6ee2de9132531be /src/main/java/eu/siacs/conversations/services | |
parent | 86afdc7aaff4ed6fa37e6d5fd9e5ffab20375f21 (diff) | |
parent | a95d2d9134508ec694cb48db361f1fd4387d1827 (diff) |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services')
-rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index c9fbf297..f39460b3 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -47,7 +47,6 @@ import java.security.cert.CertificateException; import java.security.cert.X509Certificate; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; @@ -63,7 +62,7 @@ import de.thedevstack.android.logcat.Logging; import de.thedevstack.conversationsplus.ConversationsPlusApplication; import de.thedevstack.conversationsplus.ConversationsPlusPreferences; import de.thedevstack.conversationsplus.exceptions.FileCopyException; -import de.thedevstack.conversationsplus.utils.FileHelper; +import de.thedevstack.conversationsplus.utils.FileUtils; import de.thedevstack.conversationsplus.utils.ImageUtil; import de.thedevstack.conversationsplus.utils.MessageUtil; import de.thedevstack.conversationsplus.utils.UiUpdateHelper; @@ -402,7 +401,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa } message.setCounterpart(conversation.getNextCounterpart()); message.setType(Message.TYPE_FILE); - String path = FileHelper.getRealPathFromUri(uri); + String path = FileUtils.getPath(uri); if (path != null) { message.setRelativeFilePath(path); MessageUtil.updateFileParams(message); |