narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

nick name more persistant than ever before

Browse source
This commit is contained in:
Daniel Gultsch 2014-03-14 20:19:58 +01:00
parent cc65567366
commit 29e128513d
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/eu/siacs/conversations/persistance/DatabaseBackend.java
View file

@ -138,9 +138,9 @@ public class DatabaseBackend extends SQLiteOpenHelper {
public Conversation findConversation(Account account, String contactJid) { public Conversation findConversation(Account account, String contactJid) {
SQLiteDatabase db = this.getReadableDatabase(); SQLiteDatabase db = this.getReadableDatabase();
String[] selectionArgs = { account.getUuid(), contactJid }; String[] selectionArgs = { account.getUuid(), contactJid+"%" };
Cursor cursor = db.query(Conversation.TABLENAME, null, Cursor cursor = db.query(Conversation.TABLENAME, null,
Conversation.ACCOUNT + "=? AND " + Conversation.CONTACTJID + "=?", Conversation.ACCOUNT + "=? AND " + Conversation.CONTACTJID + " like ?",
selectionArgs, null, null, null); selectionArgs, null, null, null);
if (cursor.getCount() == 0) if (cursor.getCount() == 0)
return null; return null;

1
src/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -992,7 +992,6 @@ public class XmppConnectionService extends Service {
} }
private OnRenameListener renameListener = null; private OnRenameListener renameListener = null;
private boolean pongReceived;
public void setOnRenameListener(OnRenameListener listener) { public void setOnRenameListener(OnRenameListener listener) {
this.renameListener = listener; this.renameListener = listener;

1
src/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -443,7 +443,6 @@ public class XmppConnection implements Runnable {
} else if (this.streamFeatures.hasChild("register")&&(account.isOptionSet(Account.OPTION_REGISTER))) { } else if (this.streamFeatures.hasChild("register")&&(account.isOptionSet(Account.OPTION_REGISTER))) {
sendRegistryRequest(); sendRegistryRequest();
} else if (!this.streamFeatures.hasChild("register")&&(account.isOptionSet(Account.OPTION_REGISTER))) { } else if (!this.streamFeatures.hasChild("register")&&(account.isOptionSet(Account.OPTION_REGISTER))) {
//Log.d(LOGTAG,"registration not supported. stream features where"+this.streamFeatures.toString());
changeStatus(Account.STATUS_REGISTRATION_NOT_SUPPORTED); changeStatus(Account.STATUS_REGISTRATION_NOT_SUPPORTED);
disconnect(true); disconnect(true);
} else if (this.streamFeatures.hasChild("mechanisms") } else if (this.streamFeatures.hasChild("mechanisms")