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

Merge branch 'master' into development

Browse source
This commit is contained in:
Daniel Gultsch 2015-08-23 19:44:58 +02:00
parent 412efe93c0 8043833156
commit 91a3cee6d2
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -552,7 +552,7 @@ public class Conversation extends AbstractEntity implements Blockable {
private int getMostRecentlyUsedOutgoingEncryption() { private int getMostRecentlyUsedOutgoingEncryption() {
synchronized (this.messages) { synchronized (this.messages) {
for(int i = this.messages.size() -1; i >= 0; --i) { for(int i = this.messages.size() -1; i >= 0; --i) {
final Message m = this.messages.get(0); final Message m = this.messages.get(i);
if (!m.isCarbon() && m.getStatus() != Message.STATUS_RECEIVED) { if (!m.isCarbon() && m.getStatus() != Message.STATUS_RECEIVED) {
final int e = m.getEncryption(); final int e = m.getEncryption();
if (e == Message.ENCRYPTION_DECRYPTED || e == Message.ENCRYPTION_DECRYPTION_FAILED) { if (e == Message.ENCRYPTION_DECRYPTED || e == Message.ENCRYPTION_DECRYPTION_FAILED) {
@ -569,7 +569,7 @@ public class Conversation extends AbstractEntity implements Blockable {
private int getMostRecentlyUsedIncomingEncryption() { private int getMostRecentlyUsedIncomingEncryption() {
synchronized (this.messages) { synchronized (this.messages) {
for(int i = this.messages.size() -1; i >= 0; --i) { for(int i = this.messages.size() -1; i >= 0; --i) {
final Message m = this.messages.get(0); final Message m = this.messages.get(i);
if (m.getStatus() == Message.STATUS_RECEIVED) { if (m.getStatus() == Message.STATUS_RECEIVED) {
final int e = m.getEncryption(); final int e = m.getEncryption();
if (e == Message.ENCRYPTION_DECRYPTED || e == Message.ENCRYPTION_DECRYPTION_FAILED) { if (e == Message.ENCRYPTION_DECRYPTED || e == Message.ENCRYPTION_DECRYPTION_FAILED) {

1
src/main/java/eu/siacs/conversations/persistance/FileBackend.java
View file

@ -133,7 +133,6 @@ public class FileBackend {
if (path == null) { if (path == null) {
return false; return false;
} }
Log.d(Config.LOGTAG,"using image as is. path: "+path);
BitmapFactory.Options options = new BitmapFactory.Options(); BitmapFactory.Options options = new BitmapFactory.Options();
options.inJustDecodeBounds = true; options.inJustDecodeBounds = true;
try { try {