@capacitor-community/sqlite 3.3.3-1 → 3.3.3-2

package/ios/Plugin/Utils/UtilsSecret.swift

@@ -85,7 +85,9 @@ class UtilsSecret {
 
     // MARK: - SetEncryptionSecret
 
-    class func setEncryptionSecret(passphrase: String) throws {
+    // swiftlint:disable function_body_length
+    class func setEncryptionSecret(passphrase: String,
+                                   databaseLocation: String) throws {
         do {
             if passphrase.isEmpty {
                 let msg: String = "passphrase must not be empty"
@@ -102,13 +104,16 @@ class UtilsSecret {
                 let dbList: [String] = try UtilsFile
                     .getFileList(path: databaseURL.relativePath, ext: ".db")
                 for file: String in dbList {
-                    let state: State = UtilsSQLCipher.getDatabaseState(databaseName: file)
+                    let state: State = UtilsSQLCipher
+                        .getDatabaseState(databaseLocation: databaseLocation,
+                                          databaseName: file)
                     if state.rawValue == "ENCRYPTEDGLOBALSECRET" {
                         let globalData: GlobalSQLite = GlobalSQLite()
                         let password: String = globalData.secret
 
                         let dbPath: String  = try UtilsFile
-                            .getFilePath(fileName: file)
+                            .getFilePath(databaseLocation: databaseLocation,
+                                         fileName: file)
                         try UtilsSQLCipher.changePassword(filename: dbPath,
                                                           password: password,
                                                           newpassword: passphrase)
@@ -135,10 +140,14 @@ class UtilsSecret {
         }
 
     }
+    // swiftlint:enable function_body_length
 
     // MARK: - ChangeEncryptionSecret
 
-    class func changeEncryptionSecret(passphrase: String, oldPassphrase: String) throws {
+    // swiftlint:disable function_body_length
+    class func changeEncryptionSecret(passphrase: String,
+                                      oldPassphrase: String,
+                                      databaseLocation: String) throws {
         do {
             if passphrase.isEmpty ||  oldPassphrase.isEmpty {
                 let msg: String = "Passphrase and/or oldpassphrase must not " +
@@ -153,18 +162,22 @@ class UtilsSecret {
                 let msg: String = "Given oldpassphrase is wrong"
                 throw UtilsSecretError.changeEncryptionSecret(message: msg)
             }
-            // get the list of databases
-            let databaseURL: URL = try UtilsFile.getDatabasesUrl().absoluteURL
+            // get the list of databases from the database folder
+            let databaseURL: URL = try UtilsFile
+                .getFolderURL(folderPath: databaseLocation).absoluteURL
             var isDir = ObjCBool(true)
             if FileManager.default.fileExists(atPath: databaseURL.relativePath,
                                               isDirectory: &isDir) && isDir.boolValue {
                 let dbList: [String] = try UtilsFile
                     .getFileList(path: databaseURL.relativePath, ext: ".db")
                 for file: String in dbList {
-                    let state: State = UtilsSQLCipher.getDatabaseState(databaseName: file)
+                    let state: State = UtilsSQLCipher
+                        .getDatabaseState(databaseLocation: databaseLocation,
+                                          databaseName: file)
                     if state.rawValue == "ENCRYPTEDSECRET" {
                         let dbPath: String  = try UtilsFile
-                            .getFilePath(fileName: file)
+                            .getFilePath(databaseLocation: databaseLocation,
+                                         fileName: file)
                         try UtilsSQLCipher.changePassword(filename: dbPath,
                                                           password: oldPassphrase,
                                                           newpassword: passphrase)
@@ -193,5 +206,6 @@ class UtilsSecret {
         }
 
     }
+    // swiftlint:enable function_body_length
 
 }

package/ios/Plugin/Utils/UtilsUpgrade.swift

@@ -33,10 +33,12 @@ class UtilsUpgrade {
 
     // swiftlint:disable cyclomatic_complexity
     // swiftlint:disable function_body_length
+    // swiftlint:disable function_parameter_count
     func onUpgrade(mDB: Database,
                    upgDict: [Int: [String: Any]],
                    dbName: String, currentVersion: Int,
-                   targetVersion: Int) throws -> Int {
+                   targetVersion: Int,
+                   databaseLocation: String) throws -> Int {
 
         var changes: Int = -1
         guard let upgrade: [String: Any] = upgDict[currentVersion]
@@ -76,7 +78,8 @@ class UtilsUpgrade {
                                                  toggle: false)
             // backup the database
             _ = try UtilsFile.copyFile(fileName: dbName,
-                                       toFileName: "backup-\(dbName)")
+                                       toFileName: "backup-\(dbName)",
+                                       databaseLocation: databaseLocation)
 
             let initChanges = UtilsSQLCipher.dbChanges(mDB: mDB.mDb)
 
@@ -121,6 +124,7 @@ class UtilsUpgrade {
                 message: message)
         }
     }
+    // swiftlint:enable function_parameter_count
     // swiftlint:enable function_body_length
     // swiftlint:enable cyclomatic_complexity
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor-community/sqlite",
-  "version": "3.3.3-1",
+  "version": "3.3.3-2",
   "description": "Community plugin for native & electron SQLite databases",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",