Merge branch 'master' into development

Daniel Gultsch created 10 years ago

Change summary

src/main/java/eu/siacs/conversations/entities/Conversation.java   | 4 
src/main/java/eu/siacs/conversations/persistance/FileBackend.java | 1 
2 files changed, 2 insertions(+), 3 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/entities/Conversation.java

@@ -552,7 +552,7 @@ public class Conversation extends AbstractEntity implements Blockable {
 	private int getMostRecentlyUsedOutgoingEncryption() {
 		synchronized (this.messages) {
 			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) {
 					final int e = m.getEncryption();
 					if (e == Message.ENCRYPTION_DECRYPTED || e == Message.ENCRYPTION_DECRYPTION_FAILED) {
@@ -569,7 +569,7 @@ public class Conversation extends AbstractEntity implements Blockable {
 	private int getMostRecentlyUsedIncomingEncryption() {
 		synchronized (this.messages) {
 			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) {
 					final int e = m.getEncryption();
 					if (e == Message.ENCRYPTION_DECRYPTED || e == Message.ENCRYPTION_DECRYPTION_FAILED) {

src/main/java/eu/siacs/conversations/persistance/FileBackend.java

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