From e402348f9b24853f08f323fe6208bbd42d6ced49 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 3 Jun 2016 14:18:43 +0200 Subject: disconnect account in background after deletion. fixes #1861 --- .../eu/siacs/conversations/services/XmppConnectionService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/main/java/eu/siacs/conversations') diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index 06ecb22b9..fc8159af0 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -1562,7 +1562,12 @@ public class XmppConnectionService extends Service { } } if (account.getXmppConnection() != null) { - this.disconnect(account, true); + new Thread(new Runnable() { + @Override + public void run() { + disconnect(account, true); + } + }); } Runnable runnable = new Runnable() { @Override -- cgit v1.2.3 From 161fdf7340f1a461d936947a52ceb0de67239203 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 3 Jun 2016 14:27:05 +0200 Subject: throw writeexecption in downloader if flush fails --- .../eu/siacs/conversations/http/HttpDownloadConnection.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/main/java/eu/siacs/conversations') diff --git a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java index cffed30ae..a28bb6793 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java +++ b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java @@ -304,16 +304,14 @@ public class HttpDownloadConnection implements Transferable { throw new CancellationException(); } } + try { + os.flush(); + } catch (IOException e) { + throw new WriteException(); + } } catch (CancellationException | IOException e) { throw e; } finally { - if (os != null) { - try { - os.flush(); - } catch (final IOException ignored) { - - } - } FileBackend.close(os); FileBackend.close(is); wakeLock.release(); -- cgit v1.2.3 From e26d84254979101374c5abb4a8788c9dd7e6349d Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 3 Jun 2016 18:43:45 +0200 Subject: don't use a bookmarks name if it's empty --- src/main/java/eu/siacs/conversations/entities/Bookmark.java | 5 +++-- src/main/java/eu/siacs/conversations/entities/Conversation.java | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'src/main/java/eu/siacs/conversations') diff --git a/src/main/java/eu/siacs/conversations/entities/Bookmark.java b/src/main/java/eu/siacs/conversations/entities/Bookmark.java index c5c4ff5dd..f5cfba3a2 100644 --- a/src/main/java/eu/siacs/conversations/entities/Bookmark.java +++ b/src/main/java/eu/siacs/conversations/entities/Bookmark.java @@ -52,8 +52,9 @@ public class Bookmark extends Element implements ListItem { public String getDisplayName() { if (this.mJoinedConversation != null) { return this.mJoinedConversation.getName(); - } else if (getBookmarkName() != null) { - return getBookmarkName(); + } else if (getBookmarkName() != null + && !getBookmarkName().trim().isEmpty()) { + return getBookmarkName().trim(); } else { return this.getJid().getLocalpart(); } diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index 017a85f51..8dacf8089 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -433,8 +433,10 @@ public class Conversation extends AbstractEntity implements Blockable { if (getMode() == MODE_MULTI) { if (getMucOptions().getSubject() != null) { return getMucOptions().getSubject(); - } else if (bookmark != null && bookmark.getBookmarkName() != null) { - return bookmark.getBookmarkName(); + } else if (bookmark != null + && bookmark.getBookmarkName() != null + && !bookmark.getBookmarkName().trim().isEmpty()) { + return bookmark.getBookmarkName().trim(); } else { String generatedName = getMucOptions().createNameFromParticipants(); if (generatedName != null) { -- cgit v1.2.3 From 7398424f3ba5c36ffab9a92ddd10cb3cf8eb42e0 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 3 Jun 2016 19:24:11 +0200 Subject: trim nick from bookmark before checking if it's empty --- src/main/java/eu/siacs/conversations/entities/MucOptions.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/eu/siacs/conversations') diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java index d08483703..c71afd99e 100644 --- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java +++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java @@ -504,8 +504,8 @@ public class MucOptions { public String getProposedNick() { if (conversation.getBookmark() != null && conversation.getBookmark().getNick() != null - && !conversation.getBookmark().getNick().isEmpty()) { - return conversation.getBookmark().getNick(); + && !conversation.getBookmark().getNick().trim().isEmpty()) { + return conversation.getBookmark().getNick().trim(); } else if (!conversation.getJid().isBareJid()) { return conversation.getJid().getResourcepart(); } else { -- cgit v1.2.3