moparisthebest
/
Conversations
mirror of https://github.com/moparisthebest/Conversations
1
0
Fork 0
Code Issues Releases Wiki Activity

improved next encryption selection

This commit is contained in:
Daniel Gultsch 2014-05-07 13:09:40 +02:00
parent 247f45f46b
commit daa000dd75
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/eu/siacs/conversations/entities/Conversation.java
View File

@ -56,7 +56,7 @@ public class Conversation extends AbstractEntity {
private transient String otrFingerprint = null;
private int nextMessageEncryption = Message.ENCRYPTION_NONE;
private int nextMessageEncryption = -1;
private String nextMessage;
private transient MucOptions mucOptions = null;
@ -332,6 +332,9 @@ public class Conversation extends AbstractEntity {
}
public int getNextEncryption() {
if (this.nextMessageEncryption == -1) {
return this.getLatestEncryption();
}
return this.nextMessageEncryption;
}

2
src/eu/siacs/conversations/ui/ConversationFragment.java
View File

@ -565,8 +565,6 @@ public class ConversationFragment extends Fragment {
this.messageListAdapter.notifyDataSetChanged();
if (conversation.getMode() == Conversation.MODE_SINGLE) {
if (messageList.size() >= 1) {
conversation.setNextEncryption(conversation
.getLatestEncryption());
makeFingerprintWarning(conversation.getLatestEncryption());
}
} else {