From b7b25b472cf602ab07ec2ebbb05c349a6767c2da Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 17 May 2014 19:19:06 +0200
Subject: [PATCH 1/3] receiving pgp images important bug fix

---
 src/eu/siacs/conversations/ui/ConversationFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index 5336b7936..b0e9d79b4 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -583,7 +583,7 @@ public class ConversationFragment extends Fragment {
 		ConversationActivity activity = (ConversationActivity) getActivity();
 		if (this.conversation != null) {
 			for (Message message : this.conversation.getMessages()) {
-				if (message.getEncryption() == Message.ENCRYPTION_PGP) {
+				if ((message.getEncryption() == Message.ENCRYPTION_PGP)&&((message.getStatus() == Message.STATUS_RECIEVED)||(message.getStatus() == Message.STATUS_SEND))) {
 					decryptMessage(message);
 					break;
 				}

From ae6c99012e4f26ec109233e4d29f4bd0c1eca5ea Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 17 May 2014 19:23:52 +0200
Subject: [PATCH 2/3] bumped version 0.2.3

---
 AndroidManifest.xml | 4 ++--
 CHANGELOG.md        | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4806ac324..32e83085d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="eu.siacs.conversations"
-    android:versionCode="13"
-    android:versionName="0.2.2" >
+    android:versionCode="14"
+    android:versionName="0.2.3" >
 
     <uses-sdk
         android:minSdkVersion="14"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f24146ee2..7e9aa5cbe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ###Changelog
 
+####Version 0.2.3
+* regression fix with receiving encrypted images
+
 ####Version 0.2.2
 * Ability to take photos directly
 * Improved openPGP offline handling

From 66aacf7e3edae1e4a6ec6cab72df82ae38daa096 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sat, 17 May 2014 21:57:44 +0200
Subject: [PATCH 3/3] sending session after unsucesfull session resume. fixed
 #116

---
 .../siacs/conversations/xmpp/XmppConnection.java  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/eu/siacs/conversations/xmpp/XmppConnection.java b/src/eu/siacs/conversations/xmpp/XmppConnection.java
index a04105a8f..6e55ebfec 100644
--- a/src/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -542,13 +542,6 @@ public class XmppConnection implements Runnable {
 			this.tagWriter.writeStanzaAsync(resume);
 		} else if (this.streamFeatures.hasChild("bind") && shouldBind) {
 			sendBindRequest();
-			if (this.streamFeatures.hasChild("session")) {
-				Log.d(LOGTAG,account.getJid()+": sending deprecated session");
-				IqPacket startSession = new IqPacket(IqPacket.TYPE_SET);
-				startSession.addChild("session","urn:ietf:params:xml:ns:xmpp-session"); //setContent("")
-				startSession.setId(nextRandomId());
-				this.sendPacket(startSession, null);
-			}
 		}
 	}
 
@@ -655,9 +648,17 @@ public class XmppConnection implements Runnable {
 				if (bindListener !=null) {
 					bindListener.onBind(account);
 				}
+				
 				changeStatus(Account.STATUS_ONLINE);
 			}
 		});
+		if (this.streamFeatures.hasChild("session")) {
+			Log.d(LOGTAG,account.getJid()+": sending deprecated session");
+			IqPacket startSession = new IqPacket(IqPacket.TYPE_SET);
+			startSession.addChild("session","urn:ietf:params:xml:ns:xmpp-session"); //setContent("")
+			startSession.setId(nextRandomId());
+			this.sendPacket(startSession, null);
+		}
 	}
 
 	private void sendServiceDiscoveryInfo(final String server) {