Browse Source

Merge branch '1.1.250' into IOSAD-191

* 1.1.250: (43 commits)
  updates readme to use GIT Engine repo
  IOS-2628 0 attachments
  IOS-2628 Deal with "no attachment"
  IOS-2628 Workaround empty bloblist
  IOS-2628 Test for 0-length attachments
  IOS-2628 Test for attachments in self-encrypt
  IOSAD-186 updates readme
  IOSAD-186 fixes: crashes at runtime under iOS12 using [NSObjcect new] (alloc init worked, crazy)
  IOSAD-186 rm scheme for framework that does not exist any more
  IOSAD-186 rm needless import
  IOSAD-186 fixes: session always NULL due to system.db not found
  IOSAD-186 adds fogotten files to pEp4iOS target
  IOSAD-186 rm needless import
  IOSAD-186 renames Sample App
  IOSAD-186 used old sample app
  Revert "IOSAD-186 cleanup"
  IOSAD-186 cleanup
  IOSAD-186 adds more complex test case to sample app (to reproduce linking problems with code from ewxtensions)
  IOSAD-186 fixes: extentions not linked usoing static lib. Fixed by adding -objc LF to clients build settings
  IOSAD-186 adds certain files have not been added to the pEpObjCAdapter_iOS target.
  ...
IOSAD-191
David Alarcon 10 months ago
parent
commit
e210580b87
13 changed files with 85 additions and 192 deletions
  1. +1
    -2
      PEPObjCAdapterTypes/PublicHeaders/PEPSessionProtocol.h
  2. +8
    -0
      PEPObjCAdapterTypesTests_iOS/Info.plist
  3. +10
    -10
      README.md
  4. +31
    -11
      pEpObjCAdapter.xcodeproj/project.pbxproj
  5. +0
    -100
      pEpObjCAdapter.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapterFramework.xcscheme
  6. +9
    -0
      pEpObjCAdapter/Extensions/NSArray+Engine.m
  7. +2
    -0
      pEpObjCAdapter/Extensions/NSError+PEP.m
  8. +0
    -27
      pEpObjCAdapter/Extensions/PEPAutoPointer+Message.h
  9. +0
    -23
      pEpObjCAdapter/Extensions/PEPAutoPointer+Message.m
  10. +2
    -1
      pEpObjCAdapter/Extensions/PEPMessage+Engine.m
  11. +5
    -11
      pEpObjCAdapter/PEPObjCAdapter.m
  12. +14
    -7
      pEpObjCAdapter/PEPSync.m
  13. +3
    -0
      pEpObjCTests/PEPInternalSessionTest.m

+ 1
- 2
PEPObjCAdapterTypes/PublicHeaders/PEPSessionProtocol.h View File

@ -10,11 +10,10 @@
#import "PEPTypes.h"
#import "PEPEngineTypes.h"
#import "PEPMessage.h"
@class PEPLanguage;
@class PEPIdentity;
@class PEPMessage; //DIRK: has @class and import. Makes sense?
@class PEPMessage;
NS_ASSUME_NONNULL_BEGIN


+ 8
- 0
PEPObjCAdapterTypesTests_iOS/Info.plist View File

@ -6,6 +6,8 @@
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
@ -18,5 +20,11 @@
<string>1.0</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSMainStoryboardFile</key>
<string>Main</string>
<key>NSPrincipalClass</key>
<string>NSApplication</string>
</dict>
</plist>

+ 10
- 10
README.md View File

@ -65,12 +65,6 @@ make
make install
popd
git clone https://github.com/fdik/libetpan
pushd libetpan
./autogen.sh --prefix=$(pwd)/../local/
make install
popd
GMP_VERSION="6.1.2"
GMP_DIR="gmp-${GMP_VERSION}"
TARBALL="gmp-${GMP_VERSION}.tar.bz2"
@ -122,11 +116,11 @@ make -j 4
make install
popd
# //BUFF: weget and build libz too and link it to libetpan. Rm linking dynamic lib in client afterwards.
#TODO: weget and build libz too and link it to libetpan. Rm linking dynamic lib in client afterwards.
git clone https://github.com/fdik/libetpan
pushd libetpan
# //BUFF: This is not working (afaics). libetpan is still using the systems dynamic iconv lib. I was unable yet to force libetpan to use libiconv.a
#ToDo: This is not working (afaics). libetpan is still using the systems dynamic iconv lib. I was unable yet to force libetpan to use libiconv.a
unset CFLAGS
unset LDFLAGS
export LDFLAGS="-Wl/Users/buff/workspace/pEp/src_pEpObjCAdapter_macOS/local/libiconv.a"
@ -138,12 +132,18 @@ rm -rf libetpan
git clone https://pep-security.lu/gitlab/misc/libetpan.git
git clone https://pep-security.lu/gitlab/misc/sqlite.git
hg clone https://pep.foundation/dev/repos/pEpEngine
git clone https://gitea.pep.foundation/pEp.foundation/pEpEngine
hg clone https://pep.foundation/dev/repos/pEpObjCAdapter
```
## Build
### iOS Only: Copy System DB
The `system.db` from the pEpEngine repository must be copied in the bundle that uses the pEpObjCAdapter.a static lib. The ObjCAdapter copies it at runtime in the desired directory.
Backround: Has been introduces to use Apple Shared App Directory of the client App.
### Using Xcode UI
`open pEpMacOSAdapter/pEpObjCAdapter.xcworkspace/`
@ -158,4 +158,4 @@ Build scheme "All" of pEpObjCAdapter.xcworkspace
### Build Dir & Build Artefacts
You can find the build artefacts in the `pEpMacOSAdapter/build` folder
You can find the build artefacts in the `pEpMacOSAdapter/build` folder

+ 31
- 11
pEpObjCAdapter.xcodeproj/project.pbxproj View File

@ -153,9 +153,21 @@
159C00A725BB140F00F13E2B /* PEPIdentity+Reset.m in Sources */ = {isa = PBXBuildFile; fileRef = 4326A0AC2553F882001E18C6 /* PEPIdentity+Reset.m */; };
159C00A825BB140F00F13E2B /* NSError+PEP.m in Sources */ = {isa = PBXBuildFile; fileRef = 43DED785203C25E200D45CD6 /* NSError+PEP.m */; };
159C00A925BB140F00F13E2B /* NSString+NormalizePassphrase.m in Sources */ = {isa = PBXBuildFile; fileRef = 4349CD6E24AC73FC00A22A13 /* NSString+NormalizePassphrase.m */; };
159C00AA25BB140F00F13E2B /* PEPAutoPointer+Message.m in Sources */ = {isa = PBXBuildFile; fileRef = 4366177C25778F0D00AB8ECA /* PEPAutoPointer+Message.m */; };
159C00AA25BB140F00F13E2B /* (null) in Sources */ = {isa = PBXBuildFile; };
159C00AB25BB140F00F13E2B /* PEPInternalSession+PassphraseCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 433DFBB624A61D4B00AB373B /* PEPInternalSession+PassphraseCache.m */; };
159C00B125BB141000F13E2B /* PEPAutoPointer+Message.m in Sources */ = {isa = PBXBuildFile; fileRef = 4366177C25778F0D00AB8ECA /* PEPAutoPointer+Message.m */; };
159C00B125BB141000F13E2B /* (null) in Sources */ = {isa = PBXBuildFile; };
15A922E425BF2D6000D33EAB /* NSArray+Take.h in Headers */ = {isa = PBXBuildFile; fileRef = 43209B261ECC2ACD007E7E2E /* NSArray+Take.h */; };
15A922EC25BF2D7300D33EAB /* NSArray+Engine.h in Headers */ = {isa = PBXBuildFile; fileRef = 438C0ECA254020A400337922 /* NSArray+Engine.h */; };
15A922F225BF2D7700D33EAB /* PEPIdentity+Engine.h in Headers */ = {isa = PBXBuildFile; fileRef = 438C0F1125402D6400337922 /* PEPIdentity+Engine.h */; };
15A922F825BF2D8000D33EAB /* PEPInternalSession+PassphraseCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 433DFBB524A61D4B00AB373B /* PEPInternalSession+PassphraseCache.h */; };
15A922F925BF2D8000D33EAB /* PEPIdentity+Reset.h in Headers */ = {isa = PBXBuildFile; fileRef = 4326A0AD2553F882001E18C6 /* PEPIdentity+Reset.h */; };
15A922FA25BF2D8000D33EAB /* NSString+NormalizePassphrase.h in Headers */ = {isa = PBXBuildFile; fileRef = 4349CD6D24AC73FC00A22A13 /* NSString+NormalizePassphrase.h */; };
15A922FB25BF2D8000D33EAB /* NSError+PEP.h in Headers */ = {isa = PBXBuildFile; fileRef = 43DED784203C25E200D45CD6 /* NSError+PEP.h */; };
15A922FC25BF2D8000D33EAB /* NSError+PEP+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 4360A9FD2227CFA300E62E5A /* NSError+PEP+Internal.h */; };
15A922FD25BF2D8000D33EAB /* NSNumber+PEPRating+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 4360A9FE2227EBB200E62E5A /* NSNumber+PEPRating+Internal.h */; };
15A922FE25BF2D8000D33EAB /* PEPMessage+Engine.h in Headers */ = {isa = PBXBuildFile; fileRef = 43ECE9C825407FF3005F1925 /* PEPMessage+Engine.h */; };
15A9230425BF2D9600D33EAB /* (null) in Headers */ = {isa = PBXBuildFile; };
15A9230525BF2D9700D33EAB /* (null) in Headers */ = {isa = PBXBuildFile; };
15D3D761200F61BB00A0DA20 /* PEPSessionProviderTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 15D3D760200F61BB00A0DA20 /* PEPSessionProviderTest.m */; };
43062BAD24EEC83400489258 /* PEPIdentity+isPEPUser.m in Sources */ = {isa = PBXBuildFile; fileRef = 43062BAC24EEC83400489258 /* PEPIdentity+isPEPUser.m */; };
432EF60C1C58B77900B6782A /* 0xB623F674.asc in Resources */ = {isa = PBXBuildFile; fileRef = 432EF6091C58B77900B6782A /* 0xB623F674.asc */; };
@ -199,7 +211,7 @@
4EDB862F25C062F200FA045D /* PEPIdentity+SecureCoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 4EA9B43D25BEE0990048427E /* PEPIdentity+SecureCoding.h */; settings = {ATTRIBUTES = (Public, ); }; };
4EDB863525C062F400FA045D /* PEPLanguage+SecureCoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 4EA9B56425BF277F0048427E /* PEPLanguage+SecureCoding.h */; settings = {ATTRIBUTES = (Public, ); }; };
4EDB863625C062F600FA045D /* PEPAttachment+SecureCoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 4EA9B5A525BF2A9A0048427E /* PEPAttachment+SecureCoding.h */; settings = {ATTRIBUTES = (Public, ); }; };
4EDB863C25C062F800FA045D /* PEPMessage+SecureCoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E58698125BF2FA900779EAD /* PEPMessage+SecureCoding.h */; };
4EDB863C25C062F800FA045D /* PEPMessage+SecureCoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E58698125BF2FA900779EAD /* PEPMessage+SecureCoding.h */; settings = {ATTRIBUTES = (Public, ); }; };
640F79231C9B517C00DBEC4E /* 5CB2C182_sec.asc in Resources */ = {isa = PBXBuildFile; fileRef = 640F79211C9B517C00DBEC4E /* 5CB2C182_sec.asc */; };
640F79241C9B517C00DBEC4E /* 5CB2C182.asc in Resources */ = {isa = PBXBuildFile; fileRef = 640F79221C9B517C00DBEC4E /* 5CB2C182.asc */; };
64415E2F1BE9511C00F6CBB2 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 35FB0ABD1B57F99D00377032 /* Security.framework */; platformFilter = ios; };
@ -376,8 +388,6 @@
435C0CAB222930340025C6B5 /* PEPConstants.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PEPConstants.m; sourceTree = "<group>"; };
4360A9FD2227CFA300E62E5A /* NSError+PEP+Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSError+PEP+Internal.h"; sourceTree = "<group>"; };
4360A9FE2227EBB200E62E5A /* NSNumber+PEPRating+Internal.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSNumber+PEPRating+Internal.h"; sourceTree = "<group>"; };
4366177B25778F0D00AB8ECA /* PEPAutoPointer+Message.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "PEPAutoPointer+Message.h"; sourceTree = "<group>"; };
4366177C25778F0D00AB8ECA /* PEPAutoPointer+Message.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "PEPAutoPointer+Message.m"; sourceTree = "<group>"; };
43676B631C57EA1A00233933 /* 0xB623F674.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = 0xB623F674.asc; sourceTree = "<group>"; };
43676B641C57EA1A00233933 /* B623F674_sec.asc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = B623F674_sec.asc; sourceTree = "<group>"; };
436C9A3124DC48B600007A3D /* PEPPassphraseUtil.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PEPPassphraseUtil.h; sourceTree = "<group>"; };
@ -746,8 +756,6 @@
4349CD6E24AC73FC00A22A13 /* NSString+NormalizePassphrase.m */,
433DFBB524A61D4B00AB373B /* PEPInternalSession+PassphraseCache.h */,
433DFBB624A61D4B00AB373B /* PEPInternalSession+PassphraseCache.m */,
4366177B25778F0D00AB8ECA /* PEPAutoPointer+Message.h */,
4366177C25778F0D00AB8ECA /* PEPAutoPointer+Message.m */,
);
path = Extensions;
sourceTree = "<group>";
@ -846,6 +854,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
15A922E425BF2D6000D33EAB /* NSArray+Take.h in Headers */,
1543DD3E257A3B710041EFB5 /* PEPObjCAdapter.h in Headers */,
1543DD6A257A3BA90041EFB5 /* PEPCSVScanner.h in Headers */,
1543DD7B257A3BCF0041EFB5 /* PEPPassphraseCacheInternal.h in Headers */,
@ -855,19 +864,29 @@
1543DD80257A3BCF0041EFB5 /* PEPInternalSession.h in Headers */,
1543DD41257A3B710041EFB5 /* PEPSync.h in Headers */,
1543DD44257A3B710041EFB5 /* PEPSession.h in Headers */,
15A922F225BF2D7700D33EAB /* PEPIdentity+Engine.h in Headers */,
1543DD79257A3BCF0041EFB5 /* PEPPassphraseCache.h in Headers */,
1543DD3F257A3B710041EFB5 /* PEPPassphraseProviderProtocol.h in Headers */,
1543DD78257A3BCF0041EFB5 /* PEPInternalConstants.h in Headers */,
15A9230525BF2D9700D33EAB /* (null) in Headers */,
15A922FA25BF2D8000D33EAB /* NSString+NormalizePassphrase.h in Headers */,
1543DD40257A3B710041EFB5 /* NSNumber+PEPRating.h in Headers */,
1543DD76257A3BCF0041EFB5 /* PEPAutoPointer.h in Headers */,
15A922FD25BF2D8000D33EAB /* NSNumber+PEPRating+Internal.h in Headers */,
1543DD70257A3BAE0041EFB5 /* PEPObjCAdapter+Internal.h in Headers */,
1543DD7F257A3BCF0041EFB5 /* PEPQueue.h in Headers */,
15A922FE25BF2D8000D33EAB /* PEPMessage+Engine.h in Headers */,
1543DD77257A3BCF0041EFB5 /* PEPCopyableThread.h in Headers */,
15A922F825BF2D8000D33EAB /* PEPInternalSession+PassphraseCache.h in Headers */,
15A922FB25BF2D8000D33EAB /* NSError+PEP.h in Headers */,
1543DD46257A3B710041EFB5 /* PEPConstants.h in Headers */,
15A922FC25BF2D8000D33EAB /* NSError+PEP+Internal.h in Headers */,
1543DD81257A3BCF0041EFB5 /* PEPSessionProvider.h in Headers */,
1543DD7E257A3BCF0041EFB5 /* Logger.h in Headers */,
1543DD45257A3B710041EFB5 /* PEPSendMessageDelegate.h in Headers */,
1543DD7C257A3BCF0041EFB5 /* PEPPassphraseUtil.h in Headers */,
15A922F925BF2D8000D33EAB /* PEPIdentity+Reset.h in Headers */,
15A922EC25BF2D7300D33EAB /* NSArray+Engine.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -898,6 +917,7 @@
1552D963257660C900A92F71 /* NSString+NormalizePassphrase.h in Headers */,
1552D982257660C900A92F71 /* PEPPassphraseUtil.h in Headers */,
1552D98E257660C900A92F71 /* PEPMessage+Engine.h in Headers */,
15A9230425BF2D9600D33EAB /* (null) in Headers */,
1552D97C257660C900A92F71 /* PEPPassphraseCacheEntry.h in Headers */,
1552D968257660C900A92F71 /* PEPInternalSession+PassphraseCache.h in Headers */,
1552D989257660C900A92F71 /* PEPObjCAdapter+Internal.h in Headers */,
@ -1242,7 +1262,7 @@
1543DC89257944660041EFB5 /* PEPCSVScanner.m in Sources */,
1543DCB5257944DC0041EFB5 /* PEPInternalConstants.m in Sources */,
1543DC9E257944C40041EFB5 /* PEPInternalSession.m in Sources */,
159C00AA25BB140F00F13E2B /* PEPAutoPointer+Message.m in Sources */,
159C00AA25BB140F00F13E2B /* (null) in Sources */,
159C00A825BB140F00F13E2B /* NSError+PEP.m in Sources */,
1543DCC3257944EB0041EFB5 /* PEPPassphraseCacheEntry.m in Sources */,
1543DCA6257944CB0041EFB5 /* PEPSessionProvider.m in Sources */,
@ -1278,7 +1298,7 @@
1552D969257660C900A92F71 /* NSError+PEP.m in Sources */,
1552D980257660C900A92F71 /* PEPObjCAdapter.m in Sources */,
1552D96D257660C900A92F71 /* PEPQueue.m in Sources */,
159C00B125BB141000F13E2B /* PEPAutoPointer+Message.m in Sources */,
159C00B125BB141000F13E2B /* (null) in Sources */,
1552D971257660C900A92F71 /* PEPSession.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
@ -1445,7 +1465,7 @@
"IS_IOS_BUILD=1",
"$(inherited)",
);
IPHONEOS_DEPLOYMENT_TARGET = 14.2;
IPHONEOS_DEPLOYMENT_TARGET = "${inherited}";
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "-ObjC";
@ -1468,7 +1488,7 @@
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = NQLYU6MGPN;
GCC_C_LANGUAGE_STANDARD = gnu11;
IPHONEOS_DEPLOYMENT_TARGET = 14.2;
IPHONEOS_DEPLOYMENT_TARGET = "${inherited}";
MTL_FAST_MATH = YES;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";


+ 0
- 100
pEpObjCAdapter.xcodeproj/xcshareddata/xcschemes/PEPObjCAdapterFramework.xcscheme View File

@ -1,100 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1200"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "43E3985A221D7E56008E7983"
BuildableName = "PEPObjCAdapterFramework.framework"
BlueprintName = "PEPObjCAdapterFramework"
ReferencedContainer = "container:pEpObjCAdapter.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "15B10796257520B200D06C34"
BuildableName = "libPEPObjCAdapterTypes_iOS.a"
BlueprintName = "PEPObjCAdapterTypes_iOS"
ReferencedContainer = "container:pEpObjCAdapter.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "64415E161BE94FCB00F6CBB2"
BuildableName = "pEpObjCAdapterTests.xctest"
BlueprintName = "pEpObjCAdapterTests"
ReferencedContainer = "container:pEpObjCAdapter.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "43E3985A221D7E56008E7983"
BuildableName = "PEPObjCAdapterFramework.framework"
BlueprintName = "PEPObjCAdapterFramework"
ReferencedContainer = "container:pEpObjCAdapter.xcodeproj">
</BuildableReference>
</MacroExpansion>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "43E3985A221D7E56008E7983"
BuildableName = "PEPObjCAdapterFramework.framework"
BlueprintName = "PEPObjCAdapterFramework"
ReferencedContainer = "container:pEpObjCAdapter.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

+ 9
- 0
pEpObjCAdapter/Extensions/NSArray+Engine.m View File

@ -123,7 +123,16 @@
- (bloblist_t * _Nullable)toBloblist
{
if (self.count == 0) {
return NULL;
}
bloblist_t *_bl = new_bloblist(NULL, 0, NULL, NULL);
if (!_bl) {
return NULL;
}
bloblist_t *bl =_bl;
// free() might be the default, but let's be explicit


+ 2
- 0
pEpObjCAdapter/Extensions/NSError+PEP.m View File

@ -28,6 +28,8 @@
case PEP_KEY_IMPORT_STATUS_UNKNOWN:
case PEP_VERIFY_SIGNER_KEY_REVOKED:
case PEP_DECRYPT_SIGNATURE_DOES_NOT_MATCH:
case PEP_KEY_NOT_FOUND:
case PEP_CANNOT_REENCRYPT:
return nil;
break;


+ 0
- 27
pEpObjCAdapter/Extensions/PEPAutoPointer+Message.h View File

@ -1,27 +0,0 @@
//
// PEPAutoPointer+Message.h
// PEPObjCAdapterFramework
//
// Created by Dirk Zimmermann on 02.12.20.
// Copyright © 2020 pp. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "PEPAutoPointer.h"
#import "message.h"
NS_ASSUME_NONNULL_BEGIN
@interface PEPAutoPointer (Message)
/// Specialized version that will auto-release/free the given message struct when it goes out of scope.
+ (instancetype)autoPointerWithMessage:(message *)message;
/// Specialized version that will auto-release/free the given message struct when it goes out of scope.
- (instancetype)initWithMessage:(message *)message;
@end
NS_ASSUME_NONNULL_END

+ 0
- 23
pEpObjCAdapter/Extensions/PEPAutoPointer+Message.m View File

@ -1,23 +0,0 @@
//
// PEPAutoPointer+Message.m
// PEPObjCAdapterFramework
//
// Created by Dirk Zimmermann on 02.12.20.
// Copyright © 2020 pp. All rights reserved.
//
#import "PEPAutoPointer+Message.h"
@implementation PEPAutoPointer (Message)
+ (instancetype)autoPointerWithMessage:(message *)message
{
return [[self alloc] initWithMessage:message];
}
- (instancetype)initWithMessage:(message *)message
{
return [self initWithPointer:message freeFn:(void (*)(void *)) free_message];
}
@end

+ 2
- 1
pEpObjCAdapter/Extensions/PEPMessage+Engine.m View File

@ -91,8 +91,9 @@
precomposedStringWithCanonicalMapping]
UTF8String], 0);
if (self.attachments)
if (self.attachments) {
msg->attachments = [self.attachments toBloblist];
}
return msg;
}


+ 5
- 11
pEpObjCAdapter/PEPObjCAdapter.m View File

@ -244,26 +244,21 @@ static id<PEPPassphraseProviderProtocol> s_passphraseProvider = nil;
return nil;
}
+ (void)copyAssetsIntoDocumentsDirectory:(NSBundle *)rootBundle
bundleName:(NSString *)bundleName
fileName:(NSString *)fileName {
+ (void)copyAssetsIntoDocumentsDirectory:(NSBundle *)srcBundle
fileName:(NSString *)fileName {
#ifdef IS_IOS_BUILD //BUFF: DIRK: //!!!:
NSString *systemDir = [NSString stringWithUTF8String:perMachineDirectory];
if(!(systemDir && bundleName && fileName))
if(!(srcBundle && systemDir && fileName)) {
return;
}
// Check if the database file exists in the documents directory.
NSString *destinationPath = [systemDir stringByAppendingPathComponent:fileName];
if (![[NSFileManager defaultManager] fileExistsAtPath:destinationPath]) {
// The file does not exist in the documents directory, so copy it from bundle now.
NSBundle *bundleObj = [NSBundle bundleWithPath:
[[rootBundle resourcePath]
stringByAppendingPathComponent: bundleName]];
if (!bundleObj)
return;
NSString *sourcePath =[[bundleObj resourcePath] stringByAppendingPathComponent: fileName];
NSString *sourcePath =[[srcBundle resourcePath] stringByAppendingPathComponent: fileName];
NSError *error;
[[NSFileManager defaultManager]
@ -281,7 +276,6 @@ static id<PEPPassphraseProviderProtocol> s_passphraseProvider = nil;
// iOS to force us to think about macOS
#if TARGET_OS_IPHONE
[PEPObjCAdapter copyAssetsIntoDocumentsDirectory:rootBundle
bundleName:@"pEpTrustWords.bundle"
fileName:@"system.db"];
#endif


+ 14
- 7
pEpObjCAdapter/PEPSync.m View File

@ -26,7 +26,6 @@
#import "Logger.h"
#import "PEPIdentity+Engine.h"
#import "PEPMessage+Engine.h"
#import "PEPAutoPointer+Message.h"
// MARK: - Internals
@ -273,12 +272,11 @@ static __weak PEPSync *s_pEpSync;
[self.conditionLockForJoiningSyncThread unlockWithCondition:YES];
}
- (PEP_STATUS)messageToSend:(struct _message * _Nullable)msg
/// Handles the sending of an engine provided message without caring about freeing it.
- (PEP_STATUS)messageToSendHelper:(struct _message * _Nullable)msg
{
// auto destruct
PEPAutoPointer *msgPtr = [PEPAutoPointer autoPointerWithMessage:msg];
[self blockUntilPassphraseIsEnteredIfRequired];
if (self.shutdownRequested) {
// The client has signalled that she was unable to provide a passphrase by calling
// `shutdown()`.
@ -322,15 +320,24 @@ static __weak PEPSync *s_pEpSync;
} else if (msg != NULL) {
if (self.sendMessageDelegate) {
PEPMessage *theMessage = [PEPMessage fromStruct:msg];
return (PEP_STATUS) [self.sendMessageDelegate sendMessage:theMessage];
return (PEP_STATUS) [self.sendMessageDelegate sendMessage:theMessage];
} else {
return PEP_SYNC_NO_MESSAGE_SEND_CALLBACK;
}
} else {
return PEP_SYNC_ILLEGAL_MESSAGE;
}
}
msgPtr = nil; // please the compiler
/// Uses `messageToSendHelper` to send the message and conditionally frees
/// the engine provided message.
- (PEP_STATUS)messageToSend:(struct _message * _Nullable)msg
{
PEP_STATUS status = [self messageToSendHelper:msg];
if (status == PEP_STATUS_OK) {
free(msg);
}
return status;
}
/// Injects the given event into the queue.


+ 3
- 0
pEpObjCTests/PEPInternalSessionTest.m View File

@ -679,6 +679,9 @@
XCTAssertNotNil(decmsg);
XCTAssertNil(error);
XCTAssertEqual(rating, PEPRatingTrustedAndAnonymized);
// There shouldn't be any attachments
XCTAssertEqual(decmsg.attachments.count, 0);
}
- (void)testOutgoingContactColor


Loading…
Cancel
Save