mirror of
https://github.com/moparisthebest/Conversations
synced 2024-11-05 08:45:02 -05:00
Merge branch 'master' into development
This commit is contained in:
commit
91a3cee6d2
@ -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) {
|
||||
|
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user