From 3d20a8862f1950e68634c6ab398c9e52d15dc117 Mon Sep 17 00:00:00 2001
From: Edouard Tisserant <devnull@localhost>
Date: Mon, 10 Jul 2017 16:40:47 +0200
Subject: [PATCH] JNI-35 removed blob's content-id Backed out changeset
 c5b5bcb5a576

---
 src/jniutils.cc                   | 8 ++------
 src/org/pEp/jniadapter/Blob.java  | 2 --
 src/org/pEp/jniadapter/_Blob.java | 2 --
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/jniutils.cc b/src/jniutils.cc
index e9fe65f..ecae9a6 100644
--- a/src/jniutils.cc
+++ b/src/jniutils.cc
@@ -589,7 +589,6 @@ namespace pEp {
             env->SetObjectField(obj, fieldID, reinterpret_cast<jobject>(_data));
             _setStringField(env, classname, obj, "mime_type", b->mime_type);
             _setStringField(env, classname, obj, "filename", b->filename);
-            _setStringField(env, classname, obj, "content_id", b->content_id);
 
             return obj;
         }
@@ -630,7 +629,7 @@ namespace pEp {
             jclass clazz = findClass(env, classname);
             jfieldID data_id = getFieldID(env, classname, "data", "[B");
 
-            bloblist_t *bl = new_bloblist(NULL, 0, NULL, NULL, NULL);
+            bloblist_t *bl = new_bloblist(NULL, 0, NULL, NULL);
             bloblist_t *_bl;
             jint i;
             for (_bl = bl, i = 0; i < (int) size; i++) {
@@ -639,8 +638,6 @@ namespace pEp {
                         "mime_type");
                 char *filename = _getStringField(env, classname, o,
                         "filename");
-                char *content_id = _getStringField(env, classname, o,
-                        "content_id");
 
                 jbyteArray _data =
                     reinterpret_cast<jbyteArray>(env->GetObjectField(o,
@@ -652,12 +649,11 @@ namespace pEp {
 
                 env->GetByteArrayRegion(_data, 0, size, (jbyte*)b);
 
-                _bl = bloblist_add(_bl, b, size, mime_type, filename, content_id);
+                _bl = bloblist_add(_bl, b, size, mime_type, filename);
 
                 env->DeleteLocalRef(o);
                 free(mime_type);
                 free(filename);
-                free(content_id);
             }
 
             return bl;
diff --git a/src/org/pEp/jniadapter/Blob.java b/src/org/pEp/jniadapter/Blob.java
index 198ca15..a8b21ee 100644
--- a/src/org/pEp/jniadapter/Blob.java
+++ b/src/org/pEp/jniadapter/Blob.java
@@ -4,7 +4,6 @@ public class Blob {
     public byte[] data;
     public String mime_type;
     public String filename;
-    public String content_id;
 
     public Blob() {
         mime_type = "application/octet-stream";
@@ -14,7 +13,6 @@ public class Blob {
         data = b.data;
         mime_type = AbstractEngine.toUTF16(b.mime_type);
         filename = AbstractEngine.toUTF16(b.filename);
-        content_id = AbstractEngine.toUTF16(b.content_id);
     }
 }
 
diff --git a/src/org/pEp/jniadapter/_Blob.java b/src/org/pEp/jniadapter/_Blob.java
index 672fb01..9432781 100644
--- a/src/org/pEp/jniadapter/_Blob.java
+++ b/src/org/pEp/jniadapter/_Blob.java
@@ -4,7 +4,6 @@ public class _Blob {
     public byte[] data;
     public byte[] mime_type;
     public byte[] filename;
-    public byte[] content_id;
 
     _Blob() { }
 
@@ -12,7 +11,6 @@ public class _Blob {
         data = b.data;
         mime_type = AbstractEngine.toUTF8(b.mime_type);
         filename = AbstractEngine.toUTF8(b.filename);
-        content_id = AbstractEngine.toUTF8(b.content_id);
     }
 }