pEp.foundation
/
libpEpAdapter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'Release_2.1'

pull/8/head
heck 4 years ago
parent
0517b9be69 c2e6504895
commit
768e02a6a4
6 changed files with 87 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      build-android/jni/Android.mk
  2. 2
      build-android/takeOutHeaderFiles.sh
  3. 45
      build-windows/libpEpAdapter.vcxproj
  4. 49
      build-windows/libpEpAdapter.vcxproj.filters
  5. 30
      src/message_cache.cc
  6. 10
      test/test_message_cache.cc

4
build-android/jni/Android.mk
View File

@ -18,14 +18,14 @@ LOCAL_CPPFLAGS += -std=c++14 -DANDROID_STL=c++_shared
STUB = $(shell sh $(LOCAL_PATH)/../takeOutHeaderFiles.sh $(LOCAL_PATH)/../../../pEpEngine/ $(LOCAL_PATH)/../../) STUB = $(shell sh $(LOCAL_PATH)/../takeOutHeaderFiles.sh $(LOCAL_PATH)/../../../pEpEngine/ $(LOCAL_PATH)/../../)
$(info $(STUB)) $(info $(STUB))
LIB_PEP_ADAPTER_INCLUDE_FILES := $(wildcard $(LOCAL_PATH)/../../*.h*) LIB_PEP_ADAPTER_INCLUDE_FILES := $(wildcard $(LOCAL_PATH)/../../src/*.h*)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../../pEpEngine/build-android/include \ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../../pEpEngine/build-android/include \
$(LIB_PEP_ADAPTER_INCLUDE_FILES:%=%) $(LIB_PEP_ADAPTER_INCLUDE_FILES:%=%)
LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)../include LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)../include
LOCAL_SRC_FILES += $(wildcard $(LOCAL_PATH)/../../*.cc) LOCAL_SRC_FILES += $(wildcard $(LOCAL_PATH)/../../src/*.cc)
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

2
build-android/takeOutHeaderFiles.sh
View File

@ -6,5 +6,5 @@ engine_dir="$1"
adapter_dir="$2" adapter_dir="$2"
mkdir -p "$engine_dir/build-android/include/pEp" mkdir -p "$engine_dir/build-android/include/pEp"
cp $2/*.h* "$engine_dir/build-android/include/pEp" cp $2/src/*.h* "$engine_dir/build-android/include/pEp"

45
build-windows/libpEpAdapter.vcxproj
View File

@ -86,30 +86,31 @@
<Text Include="ReadMe.txt" /> <Text Include="ReadMe.txt" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\Adapter.cc" /> <ClCompile Include="..\src\Adapter.cc" />
<ClCompile Include="..\callback_dispatcher.cc" /> <ClCompile Include="..\src\callback_dispatcher.cc" />
<ClCompile Include="..\call_with_lock.cc" /> <ClCompile Include="..\src\call_with_lock.cc" />
<ClCompile Include="..\constant_time_algo.cc" /> <ClCompile Include="..\src\constant_time_algo.cc" />
<ClCompile Include="..\message_cache.cc" /> <ClCompile Include="..\src\message_cache.cc" />
<ClCompile Include="..\passphrase_cache.cc" /> <ClCompile Include="..\src\passphrase_cache.cc" />
<ClCompile Include="..\pEpLog.cc" /> <ClCompile Include="..\src\pEpLog.cc" />
<ClCompile Include="..\slurp.cc" /> <ClCompile Include="..\src\slurp.cc" />
<ClCompile Include="..\status_to_string.cc" /> <ClCompile Include="..\src\status_to_string.cc" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\Adapter.hh" /> <ClInclude Include="..\src\Adapter.hh" />
<ClInclude Include="..\Adapter.hxx" /> <ClInclude Include="..\src\Adapter.hxx" />
<ClInclude Include="..\callback_dispatcher.hh" /> <ClInclude Include="..\src\callback_dispatcher.hh" />
<ClInclude Include="..\constant_time_algo.hh" /> <ClInclude Include="..\src\call_with_lock.hh" />
<ClInclude Include="..\locked_queue.hh" /> <ClInclude Include="..\src\constant_time_algo.hh" />
<ClInclude Include="..\message_cache.hh" /> <ClInclude Include="..\src\locked_queue.hh" />
<ClInclude Include="..\passphrase_cache.hh" /> <ClInclude Include="..\src\message_cache.hh" />
<ClInclude Include="..\passphrase_cache.hxx" /> <ClInclude Include="..\src\passphrase_cache.hh" />
<ClInclude Include="..\pc_container.hh" /> <ClInclude Include="..\src\passphrase_cache.hxx" />
<ClInclude Include="..\pEpLog.hh" /> <ClInclude Include="..\src\pc_container.hh" />
<ClInclude Include="..\Semaphore.hh" /> <ClInclude Include="..\src\pEpLog.hh" />
<ClInclude Include="..\slurp.hh" /> <ClInclude Include="..\src\Semaphore.hh" />
<ClInclude Include="..\status_to_string.hh" /> <ClInclude Include="..\src\slurp.hh" />
<ClInclude Include="..\src\status_to_string.hh" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\pEpEngine\build-windows\pEpEngine.vcxproj"> <ProjectReference Include="..\..\pEpEngine\build-windows\pEpEngine.vcxproj">

49
build-windows/libpEpAdapter.vcxproj.filters
View File

@ -18,72 +18,75 @@
<Text Include="ReadMe.txt" /> <Text Include="ReadMe.txt" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\Adapter.cc"> <ClCompile Include="..\src\Adapter.cc">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\status_to_string.cc"> <ClCompile Include="..\src\call_with_lock.cc">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\call_with_lock.cc"> <ClCompile Include="..\src\callback_dispatcher.cc">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\slurp.cc"> <ClCompile Include="..\src\constant_time_algo.cc">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\passphrase_cache.cc"> <ClCompile Include="..\src\message_cache.cc">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\callback_dispatcher.cc"> <ClCompile Include="..\src\passphrase_cache.cc">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\message_cache.cc"> <ClCompile Include="..\src\pEpLog.cc">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\constant_time_algo.cc"> <ClCompile Include="..\src\slurp.cc">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\pEpLog.cc"> <ClCompile Include="..\src\status_to_string.cc">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\Adapter.hh"> <ClInclude Include="..\src\call_with_lock.hh">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\locked_queue.hh"> <ClInclude Include="..\src\Adapter.hh">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\pc_container.hh"> <ClInclude Include="..\src\Adapter.hxx">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\Adapter.hxx"> <ClInclude Include="..\src\callback_dispatcher.hh">
<Filter>Source Files</Filter> <Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\constant_time_algo.hh">
<Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\status_to_string.hh"> <ClInclude Include="..\src\locked_queue.hh">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\slurp.hh"> <ClInclude Include="..\src\message_cache.hh">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\passphrase_cache.hh"> <ClInclude Include="..\src\passphrase_cache.hh">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\passphrase_cache.hxx"> <ClInclude Include="..\src\passphrase_cache.hxx">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\callback_dispatcher.hh"> <ClInclude Include="..\src\pc_container.hh">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\Semaphore.hh"> <ClInclude Include="..\src\pEpLog.hh">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\message_cache.hh"> <ClInclude Include="..\src\Semaphore.hh">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\constant_time_algo.hh"> <ClInclude Include="..\src\slurp.hh">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\pEpLog.hh"> <ClInclude Include="..\src\status_to_string.hh">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>

30
src/message_cache.cc
View File

@ -196,7 +196,7 @@ namespace pEp {
return false; return false;
} }
static ::message *empty_message_copy(const ::message *src, std::string _id = "") static ::message *empty_message_copy(const ::message *src, std::string _id = "", bool get_longmsg = false)
{ {
if (!src) if (!src)
return nullptr; return nullptr;
@ -207,12 +207,32 @@ namespace pEp {
dst->id = dup(src->id); dst->id = dup(src->id);
if (!emptystr(src->shortmsg)) if (get_longmsg) {
if (!emptystr(src->shortmsg)) {
dst->shortmsg = dup(src->shortmsg); dst->shortmsg = dup(src->shortmsg);
else if (!emptystr(src->longmsg)) }
// We need either longmsg or longmsg_formatted for a "message preview".
if (!emptystr(src->longmsg)) {
dst->longmsg = dup(src->longmsg);
} else {
if (!emptystr(src->longmsg_formatted)) {
dst->longmsg_formatted = dup(src->longmsg_formatted);
}
}
} else {
// It is a pEp convention to return at least one of shortmsg, longmsg or longmsg_formatted.
if (!emptystr(src->shortmsg)) {
dst->shortmsg = dup(src->shortmsg);
} else {
if (!emptystr(src->longmsg)) {
dst->longmsg = dup("pEp"); dst->longmsg = dup("pEp");
else if (!emptystr(src->longmsg_formatted)) } else {
if (!emptystr(src->longmsg_formatted)) {
dst->longmsg_formatted = dup("<pEp/>"); dst->longmsg_formatted = dup("<pEp/>");
}
}
}
}
// attachments are never copied // attachments are never copied
@ -313,7 +333,7 @@ namespace pEp {
::message *_dst = nullptr; ::message *_dst = nullptr;
PEP_STATUS status = ::decrypt_message(session, src, &_dst, keylist, rating, flags); PEP_STATUS status = ::decrypt_message(session, src, &_dst, keylist, rating, flags);
*dst = empty_message_copy(_dst, _id); *dst = empty_message_copy(_dst, _id, true);
{ {
std::lock_guard<std::mutex> l(_mtx); std::lock_guard<std::mutex> l(_mtx);

10
test/test_message_cache.cc
View File

@ -46,6 +46,7 @@ int main(int argc, char **argv)
src->dir = ::PEP_dir_outgoing; src->dir = ::PEP_dir_outgoing;
::message *dst = nullptr; ::message *dst = nullptr;
cout << "cache_encrypt_message()" << endl;
status = MessageCache::cache_encrypt_message( status = MessageCache::cache_encrypt_message(
Adapter::session(), Adapter::session(),
src, src,
@ -66,13 +67,14 @@ int main(int argc, char **argv)
mime = nullptr; mime = nullptr;
status = MessageCache::cache_mime_encode_message(MessageCache::msg_src, src, false, &mime, false); status = MessageCache::cache_mime_encode_message(MessageCache::msg_src, src, false, &mime, false);
assert(status == PEP_STATUS_OK); assert(status == PEP_STATUS_OK);
cout << "cache_mime_encode_message()" << endl;
cout << mime << endl; cout << "mime: " << endl << mime << endl;
// add to cache // add to cache
::free_message(src); ::free_message(src);
src = nullptr; src = nullptr;
cout << "cache_mime_decode_message" << endl;
status = MessageCache::cache_mime_decode_message(mime, strlen(mime), &src, &has_possible_pEp_msg); status = MessageCache::cache_mime_decode_message(mime, strlen(mime), &src, &has_possible_pEp_msg);
assert(status == PEP_STATUS_OK); assert(status == PEP_STATUS_OK);
@ -83,6 +85,7 @@ int main(int argc, char **argv)
::PEP_decrypt_flags_t flags = 0; ::PEP_decrypt_flags_t flags = 0;
::stringlist_t *keylist = nullptr; ::stringlist_t *keylist = nullptr;
cout << "cache_decrypt_message" << endl;
status = MessageCache::cache_decrypt_message( status = MessageCache::cache_decrypt_message(
Adapter::session(), Adapter::session(),
src, src,
@ -99,12 +102,13 @@ int main(int argc, char **argv)
free(mime); free(mime);
mime = nullptr; mime = nullptr;
cout << "cache_mime_encode_message" << endl;
status = MessageCache::cache_mime_encode_message(MessageCache::msg_src, src, false, &mime, false); status = MessageCache::cache_mime_encode_message(MessageCache::msg_src, src, false, &mime, false);
assert(src->longmsg == nullptr); assert(src->longmsg == nullptr);
assert(src->attachments == nullptr); assert(src->attachments == nullptr);
cout << mime << endl; cout << "mime: " << endl << mime << endl;
free(mime); free(mime);
::free_message(src); ::free_message(src);

Write Preview
Loading…
Cancel
Save