@capacitor-community/sqlite 4.6.2-2 → 4.6.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/android/build.gradle +9 -9
- package/android/src/main/java/com/getcapacitor/community/database/sqlite/CapacitorSQLite.java +6 -9
- package/android/src/main/java/com/getcapacitor/community/database/sqlite/SQLite/Database.java +7 -3
- package/android/src/main/java/com/getcapacitor/community/database/sqlite/SQLite/UtilsSecret.java +7 -0
- package/dist/esm/web.js.map +1 -1
- package/ios/Plugin/CapacitorSQLite.swift +5 -5
- package/ios/Plugin/Database.swift +7 -1
- package/ios/Plugin/Utils/UtilsEncryption.swift +10 -2
- package/package.json +2 -2
- package/src/web.ts +3 -1
package/android/build.gradle
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
ext {
|
|
2
2
|
junitVersion = project.hasProperty('junitVersion') ? rootProject.ext.junitVersion : '4.13.2'
|
|
3
|
-
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.
|
|
4
|
-
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.
|
|
5
|
-
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.
|
|
3
|
+
androidxAppCompatVersion = project.hasProperty('androidxAppCompatVersion') ? rootProject.ext.androidxAppCompatVersion : '1.6.1'
|
|
4
|
+
androidxJunitVersion = project.hasProperty('androidxJunitVersion') ? rootProject.ext.androidxJunitVersion : '1.1.5'
|
|
5
|
+
androidxEspressoCoreVersion = project.hasProperty('androidxEspressoCoreVersion') ? rootProject.ext.androidxEspressoCoreVersion : '3.5.1'
|
|
6
6
|
}
|
|
7
7
|
|
|
8
8
|
buildscript {
|
|
@@ -55,15 +55,15 @@ dependencies {
|
|
|
55
55
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
|
56
56
|
implementation project(':capacitor-android')
|
|
57
57
|
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
|
|
58
|
-
implementation 'androidx.room:room-runtime:2.
|
|
58
|
+
implementation 'androidx.room:room-runtime:2.5.0'
|
|
59
59
|
testImplementation "junit:junit:$junitVersion"
|
|
60
60
|
androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
|
|
61
61
|
androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
|
|
62
|
-
implementation "androidx.coordinatorlayout:coordinatorlayout:1.
|
|
63
|
-
implementation 'net.zetetic:android-database-sqlcipher:4.
|
|
64
|
-
implementation "androidx.sqlite:sqlite:2.
|
|
62
|
+
implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
|
|
63
|
+
implementation 'net.zetetic:android-database-sqlcipher:4.5.3'
|
|
64
|
+
implementation "androidx.sqlite:sqlite:2.3.0"
|
|
65
65
|
//security library
|
|
66
|
-
implementation "androidx.security:security-crypto:1.1.0-
|
|
66
|
+
implementation "androidx.security:security-crypto:1.1.0-alpha05"
|
|
67
67
|
implementation "androidx.biometric:biometric:1.1.0"
|
|
68
|
-
annotationProcessor 'androidx.room:room-compiler:2.
|
|
68
|
+
annotationProcessor 'androidx.room:room-compiler:2.5.0'
|
|
69
69
|
}
|
package/android/src/main/java/com/getcapacitor/community/database/sqlite/CapacitorSQLite.java
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
package com.getcapacitor.community.database.sqlite;
|
|
2
2
|
|
|
3
|
+
import static com.getcapacitor.community.database.sqlite.SQLite.UtilsSQLCipher.State.ENCRYPTED_GLOBAL_SECRET;
|
|
4
|
+
import static com.getcapacitor.community.database.sqlite.SQLite.UtilsSQLCipher.State.ENCRYPTED_SECRET;
|
|
5
|
+
import static com.getcapacitor.community.database.sqlite.SQLite.UtilsSQLCipher.State.UNENCRYPTED;
|
|
6
|
+
|
|
3
7
|
import android.content.Context;
|
|
4
8
|
import android.content.SharedPreferences;
|
|
5
9
|
import android.util.Log;
|
|
@@ -39,10 +43,6 @@ import java.util.Set;
|
|
|
39
43
|
import org.json.JSONException;
|
|
40
44
|
import org.json.JSONObject;
|
|
41
45
|
|
|
42
|
-
import static com.getcapacitor.community.database.sqlite.SQLite.UtilsSQLCipher.State.UNENCRYPTED;
|
|
43
|
-
import static com.getcapacitor.community.database.sqlite.SQLite.UtilsSQLCipher.State.ENCRYPTED_GLOBAL_SECRET;
|
|
44
|
-
import static com.getcapacitor.community.database.sqlite.SQLite.UtilsSQLCipher.State.ENCRYPTED_SECRET;
|
|
45
|
-
|
|
46
46
|
public class CapacitorSQLite {
|
|
47
47
|
|
|
48
48
|
private static final String TAG = CapacitorSQLite.class.getName();
|
|
@@ -67,7 +67,7 @@ public class CapacitorSQLite {
|
|
|
67
67
|
private final String biometricSubTitle;
|
|
68
68
|
private final int VALIDITY_DURATION = 5;
|
|
69
69
|
private final RetHandler rHandler = new RetHandler();
|
|
70
|
-
|
|
70
|
+
|
|
71
71
|
private PluginCall call;
|
|
72
72
|
|
|
73
73
|
public CapacitorSQLite(Context context, SqliteConfig config) throws Exception {
|
|
@@ -639,7 +639,6 @@ public class CapacitorSQLite {
|
|
|
639
639
|
return uFile.isFileExists(context, dbName + "SQLite.db");
|
|
640
640
|
}
|
|
641
641
|
|
|
642
|
-
|
|
643
642
|
/**
|
|
644
643
|
* IsDatabaseEncrypted
|
|
645
644
|
*
|
|
@@ -651,9 +650,7 @@ public class CapacitorSQLite {
|
|
|
651
650
|
dbName = getDatabaseName(dbName);
|
|
652
651
|
File file = context.getDatabasePath(dbName + "SQLite.db");
|
|
653
652
|
if (uFile.isFileExists(context, dbName + "SQLite.db")) {
|
|
654
|
-
UtilsSQLCipher.State state = uCipher
|
|
655
|
-
.getDatabaseState(context, file,
|
|
656
|
-
sharedPreferences, globVar);
|
|
653
|
+
UtilsSQLCipher.State state = uCipher.getDatabaseState(context, file, sharedPreferences, globVar);
|
|
657
654
|
if (state == ENCRYPTED_GLOBAL_SECRET || state == ENCRYPTED_SECRET) {
|
|
658
655
|
return true;
|
|
659
656
|
}
|
package/android/src/main/java/com/getcapacitor/community/database/sqlite/SQLite/Database.java
CHANGED
|
@@ -151,9 +151,13 @@ public class Database {
|
|
|
151
151
|
public void open() throws Exception {
|
|
152
152
|
int curVersion;
|
|
153
153
|
|
|
154
|
-
String password =
|
|
155
|
-
|
|
156
|
-
|
|
154
|
+
String password = "";
|
|
155
|
+
if (_encrypted && (_mode.equals("secret") || _mode.equals("encryption"))) {
|
|
156
|
+
if (!_uSecret.isPassphrase()) {
|
|
157
|
+
throw new Exception("No Passphrase stored");
|
|
158
|
+
}
|
|
159
|
+
password = _uSecret.getPassphrase();
|
|
160
|
+
}
|
|
157
161
|
if (_mode.equals("encryption")) {
|
|
158
162
|
if (_isEncryption) {
|
|
159
163
|
try {
|
package/android/src/main/java/com/getcapacitor/community/database/sqlite/SQLite/UtilsSecret.java
CHANGED
|
@@ -167,4 +167,11 @@ public class UtilsSecret {
|
|
|
167
167
|
public void clearPassphrase() {
|
|
168
168
|
sharedPreferences.edit().remove("secret").commit();
|
|
169
169
|
}
|
|
170
|
+
|
|
171
|
+
public Boolean isPassphrase() {
|
|
172
|
+
if (!getPassphrase().isEmpty()) {
|
|
173
|
+
return true;
|
|
174
|
+
}
|
|
175
|
+
return false;
|
|
176
|
+
}
|
|
170
177
|
}
|
package/dist/esm/web.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/web.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/web.ts"],"names":[],"mappings":"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"}
|
|
@@ -616,14 +616,14 @@ enum CapacitorSQLiteError: Error {
|
|
|
616
616
|
fileName: mDbName + "SQLite.db")
|
|
617
617
|
if isFileExists {
|
|
618
618
|
let state: State = UtilsSQLCipher
|
|
619
|
-
|
|
620
|
-
|
|
621
|
-
|
|
619
|
+
.getDatabaseState(databaseLocation: databaseLocation,
|
|
620
|
+
databaseName: mDbName + "SQLite.db",
|
|
621
|
+
account: account)
|
|
622
622
|
if state.rawValue == "ENCRYPTEDGLOBALSECRET" || state.rawValue == "ENCRYPTEDSECRET" {
|
|
623
|
-
return 1
|
|
623
|
+
return 1
|
|
624
624
|
}
|
|
625
625
|
if state.rawValue == "UNENCRYPTED" {
|
|
626
|
-
return 0
|
|
626
|
+
return 0
|
|
627
627
|
}
|
|
628
628
|
throw CapacitorSQLiteError.failed(message: "Database unknown")
|
|
629
629
|
} else {
|
|
@@ -103,6 +103,11 @@ class Database {
|
|
|
103
103
|
func open () throws {
|
|
104
104
|
var password: String = ""
|
|
105
105
|
if isEncryption && encrypted && (mode == "secret" || mode == "encryption") {
|
|
106
|
+
let isPassphrase = try UtilsSecret.isPassphrase(account: account)
|
|
107
|
+
if !isPassphrase {
|
|
108
|
+
let msg: String = "No Passphrase stored"
|
|
109
|
+
throw DatabaseError.open(message: msg)
|
|
110
|
+
}
|
|
106
111
|
password = UtilsSecret.getPassphrase(account: account)
|
|
107
112
|
}
|
|
108
113
|
if mode == "encryption" {
|
|
@@ -110,7 +115,8 @@ class Database {
|
|
|
110
115
|
do {
|
|
111
116
|
let ret: Bool = try UtilsEncryption
|
|
112
117
|
.encryptDatabase(databaseLocation: databaseLocation,
|
|
113
|
-
filePath: path, password: password
|
|
118
|
+
filePath: path, password: password,
|
|
119
|
+
version: dbVersion)
|
|
114
120
|
if !ret {
|
|
115
121
|
let msg: String = "Failed in encryption"
|
|
116
122
|
throw DatabaseError.open(message: msg)
|
|
@@ -18,9 +18,10 @@ class UtilsEncryption {
|
|
|
18
18
|
|
|
19
19
|
// swiftlint:disable function_body_length
|
|
20
20
|
class func encryptDatabase(databaseLocation: String, filePath: String,
|
|
21
|
-
password: String) throws -> Bool {
|
|
21
|
+
password: String, version: Int) throws -> Bool {
|
|
22
22
|
var ret: Bool = false
|
|
23
23
|
var oDB: OpaquePointer?
|
|
24
|
+
var eDB: OpaquePointer?
|
|
24
25
|
do {
|
|
25
26
|
if UtilsFile.isFileExist(filePath: filePath) {
|
|
26
27
|
do {
|
|
@@ -34,7 +35,7 @@ class UtilsEncryption {
|
|
|
34
35
|
.openOrCreateDatabase(filename: tempPath,
|
|
35
36
|
password: "",
|
|
36
37
|
readonly: false)
|
|
37
|
-
|
|
38
|
+
eDB = try UtilsSQLCipher
|
|
38
39
|
.openOrCreateDatabase(filename: filePath,
|
|
39
40
|
password: password,
|
|
40
41
|
readonly: false)
|
|
@@ -48,6 +49,13 @@ class UtilsEncryption {
|
|
|
48
49
|
try _ = UtilsFile
|
|
49
50
|
.deleteFile(fileName: "temp.db",
|
|
50
51
|
databaseLocation: databaseLocation)
|
|
52
|
+
// set the version
|
|
53
|
+
let sqltr: String = "PRAGMA user_version = \(version);"
|
|
54
|
+
if sqlite3_exec(eDB, sqltr, nil, nil, nil) != SQLITE_OK {
|
|
55
|
+
throw UtilsEncryptionError
|
|
56
|
+
.encryptionFailed(message: "set version to \(version) failed")
|
|
57
|
+
}
|
|
58
|
+
|
|
51
59
|
ret = true
|
|
52
60
|
}
|
|
53
61
|
// close the db
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@capacitor-community/sqlite",
|
|
3
|
-
"version": "4.6.2
|
|
3
|
+
"version": "4.6.2",
|
|
4
4
|
"description": "Community plugin for native & electron SQLite databases",
|
|
5
5
|
"main": "dist/plugin.cjs.js",
|
|
6
6
|
"module": "dist/esm/index.js",
|
|
@@ -94,6 +94,6 @@
|
|
|
94
94
|
}
|
|
95
95
|
},
|
|
96
96
|
"dependencies": {
|
|
97
|
-
"jeep-sqlite": "^
|
|
97
|
+
"jeep-sqlite": "^2.0.0"
|
|
98
98
|
}
|
|
99
99
|
}
|
package/src/web.ts
CHANGED
|
@@ -537,7 +537,9 @@ export class CapacitorSQLiteWeb
|
|
|
537
537
|
throw this.unimplemented('Not implemented on web.');
|
|
538
538
|
}
|
|
539
539
|
|
|
540
|
-
async isDatabaseEncrypted(
|
|
540
|
+
async isDatabaseEncrypted(
|
|
541
|
+
options: capSQLiteOptions,
|
|
542
|
+
): Promise<capSQLiteResult> {
|
|
541
543
|
console.log('isDatabaseEncrypted', options);
|
|
542
544
|
throw this.unimplemented('Not implemented on web.');
|
|
543
545
|
}
|