[sword-svn] r3665 - trunk/bindings

[scribe at crosswire.org]

Author: scribe
Date: 2019-06-26 19:03:12 -0700 (Wed, 26 Jun 2019)
New Revision: 3665

Modified:
   trunk/bindings/flatapi.cpp
Log:
Updated flatapi getRemoteModInfo to match getModInfo with CipherKey logic

Modified: trunk/bindings/flatapi.cpp
===================================================================
--- trunk/bindings/flatapi.cpp	2019-06-18 17:21:07 UTC (rev 3664)
+++ trunk/bindings/flatapi.cpp	2019-06-27 02:03:12 UTC (rev 3665)
@@ -1723,7 +1723,6 @@
 
 		SWBuf type = module->getType();
 		SWBuf cat = module->getConfigEntry("Category");
-		const char *cipherKey = module->getConfigEntry("CipherKey");
 		if (cat.length() > 0) type = cat;
 
 		stdstr(&(retVal[i].name), assureValidUTF8(module->getName()));
@@ -1732,7 +1731,11 @@
 		stdstr(&(retVal[i].language), assureValidUTF8(module->getLanguage()));
 		stdstr(&(retVal[i].version), assureValidUTF8(version.c_str()));
 		stdstr(&(retVal[i].delta), assureValidUTF8(statusString.c_str()));
-		stdstr(&(retVal[i].cipherKey), cipherKey ? (const char *)assureValidUTF8(cipherKey) : (const char *)0);
+		const char *cipherKey = module->getConfigEntry("CipherKey");
+		if (cipherKey) {
+			stdstr(&(retVal[i].cipherKey), assureValidUTF8(cipherKey));
+		}
+		else	retVal[i].cipherKey = 0;
 
 		ConfigEntMap::const_iterator start = module->getConfig().lower_bound("Feature");
 		ConfigEntMap::const_iterator end   = module->getConfig().upper_bound("Feature");