otr4j: update to 0.22

Michael created 11 years ago

Change summary

build.gradle                                                             | 2 
src/main/java/eu/siacs/conversations/crypto/OtrEngine.java               | 6 
src/main/java/eu/siacs/conversations/generator/MessageGenerator.java     | 2 
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 2 
4 files changed, 9 insertions(+), 3 deletions(-)

Detailed changes

build.gradle

@@ -32,7 +32,7 @@ dependencies {
 	compile project(':libs:MemorizingTrustManager')
 	compile 'com.android.support:support-v13:21.0.3'
 	compile 'org.bouncycastle:bcprov-jdk15on:1.50'
-	compile 'net.java:otr4j:0.21'
+	compile 'net.java:otr4j:0.22'
 	compile 'org.gnu.inet:libidn:1.15'
 	compile 'com.google.zxing:core:3.1.0'
 	compile 'com.google.zxing:android-integration:3.1.0'

src/main/java/eu/siacs/conversations/crypto/OtrEngine.java

@@ -33,6 +33,7 @@ import net.java.otr4j.crypto.OtrCryptoEngineImpl;
 import net.java.otr4j.crypto.OtrCryptoException;
 import net.java.otr4j.session.InstanceTag;
 import net.java.otr4j.session.SessionID;
+import net.java.otr4j.session.FragmenterInstructions;
 
 public class OtrEngine extends OtrCryptoEngineImpl implements OtrEngineHost {
 
@@ -269,4 +270,9 @@ public class OtrEngine extends OtrCryptoEngineImpl implements OtrEngineHost {
 		}
 	}
 
+	@Override
+	public FragmenterInstructions getFragmenterInstructions(SessionID sessionID) {
+		return null;
+	}
+
 }

src/main/java/eu/siacs/conversations/generator/MessageGenerator.java

@@ -68,7 +68,7 @@ public class MessageGenerator extends AbstractGenerator {
 		packet.addChild("private", "urn:xmpp:carbons:2");
 		packet.addChild("no-copy", "urn:xmpp:hints");
 		try {
-			packet.setBody(otrSession.transformSending(message.getBody()));
+			packet.setBody(otrSession.transformSending(message.getBody())[0]);
 			return packet;
 		} catch (OtrException e) {
 			return null;

src/main/java/eu/siacs/conversations/services/XmppConnectionService.java

@@ -1688,7 +1688,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			try {
 				packet.setBody(otrSession
 						.transformSending(CryptoHelper.FILETRANSFER
-								+ CryptoHelper.bytesToHex(symmetricKey)));
+								+ CryptoHelper.bytesToHex(symmetricKey))[0]);
 				sendMessagePacket(account, packet);
 				conversation.setSymmetricKey(symmetricKey);
 				return true;