# HG changeset patch # User Nikita Kozlov # Date 1314059154 -7200 # Node ID 54664632dcc9c91a25f0843742d23b26f71537a7 # Parent a4bbcfbd0a9157249911a453006639ea94512546 fix bug on otr status diff -r a4bbcfbd0a91 -r 54664632dcc9 src/com/beem/project/beem/otr/BeemOtrManager.java --- a/src/com/beem/project/beem/otr/BeemOtrManager.java Tue Aug 23 01:12:26 2011 +0200 +++ b/src/com/beem/project/beem/otr/BeemOtrManager.java Tue Aug 23 02:25:54 2011 +0200 @@ -173,19 +173,17 @@ SessionStatus status = mOtrEngine.getSessionStatus(sessionID); - if (status.equals(SessionStatus.ENCRYPTED)) { - if (mOtrKeyManager.isVerified(sessionID)) { - mChats.get(sessionID).otrStateChanged("AUTHENTICATED"); - } else - mChats.get(sessionID).otrStateChanged(status.toString()); - } - if (mOtrEngine.getSessionStatus(sessionID) == SessionStatus.FINISHED) { + if (status.equals(SessionStatus.ENCRYPTED) && mOtrKeyManager.isVerified(sessionID)) { + mChats.get(sessionID).otrStateChanged("AUTHENTICATED"); + } else if (status.equals(SessionStatus.FINISHED)) { try { mChats.get(sessionID).localEndOtrSession(); } catch (OtrException e) { e.printStackTrace(); } } + else + mChats.get(sessionID).otrStateChanged(status.toString()); } } }