From fcc20e7507f9bd0446e287daee268e863b87b687 Mon Sep 17 00:00:00 2001
From: heck <heck@pep.foundation>
Date: Tue, 18 Feb 2020 12:48:33 +0100
Subject: [PATCH] Renaming of methods for semantical reasons, add plain data
 output to Blob.toString()

---
 src/foundation/pEp/jniadapter/Blob.java  | 3 ++-
 src/foundation/pEp/jniadapter/_Blob.java | 6 +++---
 src/foundation_pEp_jniadapter__Blob.cc   | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/foundation/pEp/jniadapter/Blob.java b/src/foundation/pEp/jniadapter/Blob.java
index 4b37839..970508d 100644
--- a/src/foundation/pEp/jniadapter/Blob.java
+++ b/src/foundation/pEp/jniadapter/Blob.java
@@ -20,7 +20,8 @@ public class Blob {
         String ret = "";
         ret += "mime_type: \"" + mime_type + "\"\n";
         ret += "filename: \"" + filename + "\"\n";
-        ret += "data: \"" + _b.toString() + "\"\n";
+        ret += "data plain: \"" + data + "\"\n";
+        ret += "data decoded: \"" + _b.dataToXER() + "\"\n";
         return ret;
     }
 
diff --git a/src/foundation/pEp/jniadapter/_Blob.java b/src/foundation/pEp/jniadapter/_Blob.java
index 4f238f9..4a78ea9 100644
--- a/src/foundation/pEp/jniadapter/_Blob.java
+++ b/src/foundation/pEp/jniadapter/_Blob.java
@@ -7,9 +7,9 @@ public class _Blob {
 
     _Blob() { }
 
-    private native byte[] _toString() throws pEpException;;
-    public String toString() {
-        return AbstractEngine.toUTF16(_toString());
+    private native byte[] _dataToXER() throws pEpException;;
+    public String dataToXER() {
+        return AbstractEngine.toUTF16(_dataToXER());
     }
 
     _Blob(Blob b) {
diff --git a/src/foundation_pEp_jniadapter__Blob.cc b/src/foundation_pEp_jniadapter__Blob.cc
index f2094b8..ea719bd 100644
--- a/src/foundation_pEp_jniadapter__Blob.cc
+++ b/src/foundation_pEp_jniadapter__Blob.cc
@@ -29,7 +29,7 @@ extern "C" {
 
 using namespace std;
 using namespace pEp::JNIAdapter;
-JNIEXPORT jbyteArray JNICALL Java_foundation_pEp_jniadapter__1Blob__1toString
+JNIEXPORT jbyteArray JNICALL Java_foundation_pEp_jniadapter__1Blob__1dataToXER
   (JNIEnv *env, jobject obj)
 {
     bloblist_t *b = to_blob(env, obj);