Skip to content

Commit 6ad09b0

Browse files
committed
Merge branch 'master' of github.com:OutSystems/cordova-outsystems-secure-sqlite-bundle
2 parents acee642 + ae4f6f4 commit 6ad09b0

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

plugin.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@
1414
<clobbers target="OutSystemsSecureSQLiteBundle" />
1515
</js-module>
1616

17-
<dependency id="cordova-sqlcipher-adapter" url="https://github.com/OutSystems/cordova-sqlcipher-adapter.git" commit="0.1.7-OS5" />
18-
<dependency id="cordova-plugin-secure-storage" url="https://github.com/OutSystems/cordova-plugin-secure-storage.git" commit="2.6.8-OS5" />
17+
<dependency id="cordova-sqlcipher-adapter" url="https://github.com/OutSystems/cordova-sqlcipher-adapter.git#0.1.7-OS6" />
18+
<dependency id="cordova-plugin-secure-storage" url="https://github.com/OutSystems/cordova-plugin-secure-storage.git#2.6.8-OS5" />
1919

20-
<dependency id="outsystems-plugin-disable-backup" url="https://github.com/OutSystems/outsystems-plugin-disable-backup.git" commit="1.0.2" />
21-
<dependency id="com.outsystems.plugins.logger"/>
20+
<dependency id="outsystems-plugin-disable-backup" url="https://github.com/OutSystems/outsystems-plugin-disable-backup.git#1.0.2" />
2221

2322
<engines>
2423
<engine name="cordova" version=">=6.4.0"/>

www/outsystems-secure-sqlite-init.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
// Force dependency load
22
var SQLiteCipher = require('cordova-sqlcipher-adapter.SQLitePlugin');
33
var SecureStorage = require('cordova-plugin-secure-storage.SecureStorage');
4-
var Logger = require('com.outsystems.plugins.logger.OSLogger');
54

5+
var Logger = !!OutSystemsNative ? OutSystemsNative.Logger : undefined;
6+
if (typeof(Logger) === "undefined") {
7+
throw new Error("Dependencies were not loaded correctly: OutSystemsNative.Logger is not defined.");
8+
}
69
// Validate SQLite plugin API is properly set
710
if (typeof(window.sqlitePlugin) === "undefined") {
811
throw new Error("Dependencies were not loaded correctly: window.sqlitePlugin is not defined.");

0 commit comments

Comments
 (0)