fix: default values

HGPoint · May 11, 2023 · 9aa1d3f · 9aa1d3f
1 parent 5cfb40c
commit 9aa1d3f
Showing 4 changed files with 22 additions and 14 deletions.
diff --git a/def_ios_storage/api/def_ios_storage.script_api b/def_ios_storage/api/def_ios_storage.script_api
@@ -1,6 +1,6 @@
 - name: def_ios_storage
   type: table
-  desc: Functions for interacting with iOS keychain
+  desc: Functions for interacting with Appsflyer Ad Revenue
   members:
 
 #*****************************************************************************************************

diff --git a/def_ios_storage/src/ios_storage.cpp b/def_ios_storage/src/ios_storage.cpp
@@ -11,14 +11,22 @@
 #include <stdlib.h>
 #include "ios_storage.h"
 
-namespace dmIOSStorageExt {
+namespace dmAppsflyerAdRevenue {
 
 static int Lua_get_string(lua_State* L)
 {
     DM_LUA_STACK_CHECK(L, 1);
     const char* key = (const char*)luaL_checkstring(L, 1);
-    const char* defaultValue = (const char*)luaL_checkstring(L, 2);
-    const char* value = GetStringValue(key, defaultValue);
+    const char* typeName = (const char*)luaL_typename(L, 2);
+    const char* defaultValue = NULL;
+    if (typeName != "nil")
+        defaultValue = (const char*)luaL_checkstring(L, 2);
+
+    const char* value = GetStringValue(key);
+
+    if (value == NULL)
+        value = defaultValue;
+
     lua_pushstring(L, value);
     return 1;
 }
@@ -47,36 +55,36 @@ static void LuaInit(lua_State* L)
     assert(top == lua_gettop(L));
 }
 
-static dmExtension::Result AppInitializeIOSStorageExt(dmExtension::AppParams* params)
+static dmExtension::Result AppInitializeAppsflyerAdRevenue(dmExtension::AppParams* params)
 {
     return dmExtension::RESULT_OK;
 }
 
-static dmExtension::Result InitializeIOSStorageExt(dmExtension::Params* params)
+static dmExtension::Result InitializeAppsflyerAdRevenue(dmExtension::Params* params)
 {
     LuaInit(params->m_L);
     dmLogInfo("Registered extension def_ios_storage");
     return dmExtension::RESULT_OK;
 }
 
-static dmExtension::Result UpdateIOSStorageExt(dmExtension::Params* params)
+static dmExtension::Result UpdateAppsflyerAdRevenue(dmExtension::Params* params)
 {
     return dmExtension::RESULT_OK;
 }
 
-static dmExtension::Result AppFinalizeIOSStorageExt(dmExtension::AppParams* params)
+static dmExtension::Result AppFinalizeAppsflyerAdRevenue(dmExtension::AppParams* params)
 {
     return dmExtension::RESULT_OK;
 }
 
-static dmExtension::Result FinalizeIOSStorageExt(dmExtension::Params* params)
+static dmExtension::Result FinalizeAppsflyerAdRevenue(dmExtension::Params* params)
 {
     return dmExtension::RESULT_OK;
 }
 
 } // namespace
 
-DM_DECLARE_EXTENSION(EXTENSION_NAME, LIB_NAME, dmIOSStorageExt::AppInitializeIOSStorageExt, dmIOSStorageExt::AppFinalizeIOSStorageExt, dmIOSStorageExt::InitializeIOSStorageExt, dmIOSStorageExt::UpdateIOSStorageExt,  0, dmIOSStorageExt::FinalizeIOSStorageExt)
+DM_DECLARE_EXTENSION(EXTENSION_NAME, LIB_NAME, dmAppsflyerAdRevenue::AppInitializeAppsflyerAdRevenue, dmAppsflyerAdRevenue::AppFinalizeAppsflyerAdRevenue, dmAppsflyerAdRevenue::InitializeAppsflyerAdRevenue, dmAppsflyerAdRevenue::UpdateAppsflyerAdRevenue,  0, dmAppsflyerAdRevenue::FinalizeAppsflyerAdRevenue)
 
 #else // platform
 DM_DECLARE_EXTENSION(EXTENSION_NAME, LIB_NAME, 0, 0, 0, 0,  0, 0)

diff --git a/def_ios_storage/src/ios_storage.h b/def_ios_storage/src/ios_storage.h
@@ -4,11 +4,11 @@
 
 #include <dmsdk/sdk.h>
 
-namespace dmIOSStorageExt 
+namespace dmAppsflyerAdRevenue 
 {
 
 void SetStringValue(const char* key, const char*  value);
-const char*  GetStringValue(const char* key, const char*  defaultValue);
+const char*  GetStringValue(const char* key);
 
 void SetDoubleValue(const char* key, double value);
 double GetDoubleValue(const char* key, double defaultValue);

diff --git a/def_ios_storage/src/ios_storage.mm b/def_ios_storage/src/ios_storage.mm
@@ -10,7 +10,7 @@
 #include <UIKit/UIKit.h>
 #endif
 
-namespace dmIOSStorageExt {
+namespace dmAppsflyerAdRevenue {
 
 
 void SetStringValue(const char* key, const char*  value)
@@ -21,7 +21,7 @@ void SetStringValue(const char* key, const char*  value)
         NSString *username = [bindings objectForKey:[NSString stringWithUTF8String:key]];
 }
 
-const char* GetStringValue(const char* key, const char*  defaultValue)
+const char* GetStringValue(const char* key)
 {
         PDKeychainBindings *bindings = [PDKeychainBindings sharedKeychainBindings];
         NSString *username = [bindings objectForKey:[NSString stringWithUTF8String:key]];