aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-12-04 14:07:16 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-12-04 14:07:16 +0100
commit242887447c09846f8b4eaeb8a29406e5135ec906 (patch)
tree24dc8670755375cb2cc90f0943e4a2682438b817 /src/main/java
parent6b592435cd7bc831f0aac1bb159229dae955fb9b (diff)
use proposed nick as default nick in mucoptions
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/MucOptions.java2
-rw-r--r--src/main/java/eu/siacs/conversations/parser/PresenceParser.java4
-rw-r--r--src/main/java/eu/siacs/conversations/services/XmppConnectionService.java3
3 files changed, 1 insertions, 8 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index 412f984f..92254b90 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -246,7 +246,7 @@ public class MucOptions {
public MucOptions(Conversation conversation) {
this.account = conversation.getAccount();
this.conversation = conversation;
- this.self = new User(this,conversation.getJid());
+ this.self = new User(this,createJoinJid(getProposedNick()));
}
public void updateFeatures(ArrayList<String> features) {
diff --git a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
index f9448528..12ffd33f 100644
--- a/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
@@ -1,11 +1,8 @@
package eu.siacs.conversations.parser;
-import android.util.Log;
-
import java.util.ArrayList;
import java.util.List;
-import eu.siacs.conversations.Config;
import eu.siacs.conversations.crypto.PgpEngine;
import eu.siacs.conversations.entities.Account;
import eu.siacs.conversations.entities.Contact;
@@ -93,7 +90,6 @@ public class PresenceParser extends AbstractParser implements
} else {
mXmppConnectionService.fetchAvatar(mucOptions.getAccount(), avatar);
}
- Log.d(Config.LOGTAG, "user " + avatar.owner + " has avatar");
}
}
}
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 2bafb03a..77606956 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1720,9 +1720,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
Account account = conversation.getAccount();
final String nick = conversation.getMucOptions().getProposedNick();
final Jid joinJid = conversation.getMucOptions().createJoinJid(nick);
- if (joinJid == null) {
- return; //safety net
- }
Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": joining conversation " + joinJid.toString());
PresencePacket packet = new PresencePacket();
packet.setFrom(conversation.getAccount().getJid());