nick name more persistant than ever before

Daniel Gultsch created 12 years ago

Change summary

src/eu/siacs/conversations/persistance/DatabaseBackend.java    | 4 ++--
src/eu/siacs/conversations/services/XmppConnectionService.java | 1 -
src/eu/siacs/conversations/xmpp/XmppConnection.java            | 1 -
3 files changed, 2 insertions(+), 4 deletions(-)

Detailed changes

src/eu/siacs/conversations/persistance/DatabaseBackend.java

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

src/eu/siacs/conversations/services/XmppConnectionService.java

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

src/eu/siacs/conversations/xmpp/XmppConnection.java

@@ -443,7 +443,6 @@ public class XmppConnection implements Runnable {
 		} else if (this.streamFeatures.hasChild("register")&&(account.isOptionSet(Account.OPTION_REGISTER))) {
 				sendRegistryRequest();
 		} 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);
 			disconnect(true);
 		} else if (this.streamFeatures.hasChild("mechanisms")