Merge branch 'theo/sdk_type_option' into 'master'

TKRTankerOptions: expose sdkType See merge request TankerHQ/sdk-ios!160
TankerHQ · Apr 21, 2021 · 1ed8eb7 · 1ed8eb7
2 parents ad39e30 + 36e04fa
commit 1ed8eb7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 24 deletions.
diff --git a/Tanker/Headers/TKRTankerOptions.h b/Tanker/Headers/TKRTankerOptions.h
@@ -28,6 +28,8 @@
  */
 @property NSString* writablePath;
 
+@property NSString* sdkType;
+
 /*!
   @brief Create and return an empty TKRTankerOptions.
  */

diff --git a/Tanker/Sources/TKRTanker.m b/Tanker/Sources/TKRTanker.m
@@ -7,7 +7,7 @@
 #import "TKREncryptionSession+Private.h"
 #import "TKRInputStreamDataSource+Private.h"
 #import "TKRTanker+Private.h"
-#import "TKRTankerOptions+Private.h"
+#import "TKRTankerOptions.h"
 #import "TKRUtils+Private.h"
 #import "TKRVerification+Private.h"
 #import "TKRVerificationKey+Private.h"

diff --git a/Tanker/Sources/TKRTankerOptions+Private.m b/Tanker/Sources/TKRTankerOptions+Private.m
diff --git a/Tanker/Tests/Tests.m b/Tanker/Tests/Tests.m
@@ -4,7 +4,7 @@
 #import "TKRError.h"
 #import "TKRInputStreamDataSource+Private.h"
 #import "TKRTanker.h"
-#import "TKRTankerOptions+Private.h"
+#import "TKRTankerOptions.h"
 #import "TKRVerification.h"
 #import "TKRVerificationKey.h"
 
@@ -100,7 +100,7 @@
   opts.url = url;
   opts.appID = appID;
   opts.writablePath = createStorageFullpath();
-  opts.sdkType = @"test";
+  opts.sdkType = @"sdk-ios-tests";
   return opts;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,8 @@ @@
      */
     @property NSString* writablePath;
+    @property NSString* sdkType;
     /*!
       @brief Create and return an empty TKRTankerOptions.
      */
@@ Expand Down @@