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

hrukudah #15

Closed
bodqhrohro wants to merge 30 commits from hrukudah into master
pull from: hrukudah
merge into: narayana:master
Conversation 0 Commits 30 Files changed 54 -8
2 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit d970679064 - Show all commits

2
src/main/java/eu/siacs/conversations/entities/Conversation.java
View file

@ -967,7 +967,6 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
presence, presence,
"xmpp"); "xmpp");
this.otrSession = new SessionImpl(sessionId, getAccount().getOtrService()); this.otrSession = new SessionImpl(sessionId, getAccount().getOtrService());
android.util.Log.e("41fd", "new session " + System.identityHashCode(this), new RuntimeException());
try { try {
if (sendStart) { if (sendStart) {
this.otrSession.startSession(); this.otrSession.startSession();
@ -986,7 +985,6 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
} }
public void resetOtrSession() { public void resetOtrSession() {
android.util.Log.e("41fd", "reset " + System.identityHashCode(this), new RuntimeException());
this.otrFingerprint = null; this.otrFingerprint = null;
this.otrSession = null; this.otrSession = null;
this.mSmp.hint = null; this.mSmp.hint = null;

6
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -2617,15 +2617,11 @@ public class XmppConnectionService extends Service {
public Conversation findOrCreateConversation(final Account account, final Jid jid, final MessageArchiveService.Query query, final boolean muc, final boolean joinAfterCreate, final boolean async, Jid counterpart) { public Conversation findOrCreateConversation(final Account account, final Jid jid, final MessageArchiveService.Query query, final boolean muc, final boolean joinAfterCreate, final boolean async, Jid counterpart) {
synchronized (this.conversations) { synchronized (this.conversations) {
android.util.Log.e("41fd", jid.toString() + " " + counterpart);
Conversation conversation = find(account, jid, counterpart); Conversation conversation = find(account, jid, counterpart);
if (conversation != null) { if (conversation != null) {
return conversation; return conversation;
} }
android.util.Log.e("41fd 1 not find", jid.toString() + " " + counterpart);
conversation = databaseBackend.findConversation(account, jid, counterpart); conversation = databaseBackend.findConversation(account, jid, counterpart);
final boolean loadMessagesFromDb; final boolean loadMessagesFromDb;
if (conversation != null) { if (conversation != null) {
@ -2657,8 +2653,6 @@ public class XmppConnectionService extends Service {
Conversation.MODE_SINGLE, counterpart); Conversation.MODE_SINGLE, counterpart);
} }
this.databaseBackend.createConversation(conversation); this.databaseBackend.createConversation(conversation);
android.util.Log.e("41fd 2 not find", jid.toString() + " " + counterpart);
loadMessagesFromDb = false; loadMessagesFromDb = false;
} }
final Conversation c = conversation; final Conversation c = conversation;