fix(android, iOS): remove dependencies to OSLogger (#16)

* test: comment out dependencies to OSLogger

* feat: replace logs using Logger with default Android logs

References: https://outsystemsrd.atlassian.net/browse/RMET-4297

* feat: replace log using OSLogger with default iOS log

References: https://outsystemsrd.atlassian.net/browse/RMET-4297

* chore(release): raise to version 0.1.7-OS10

References: https://outsystemsrd.atlassian.net/browse/RMET-4297

Author: alexgerardojacinto

CHANGES.md

@@ -4,6 +4,10 @@
 
 - Update SQLite to 3.46.1 (https://outsystemsrd.atlassian.net/browse/RMET-3850).
 
+## cordova-sqlcipher-adapter 0.1.7-OS10
+
+- Fix: Remove dependencies to OSLogger (https://outsystemsrd.atlassian.net/browse/RMET-4297).
+
 ## cordova-sqlcipher-adapter 0.1.7-OS9
 
 - Update SQLCipher to 4.6.1, with support for 16KB page size devices (https://outsystemsrd.atlassian.net/browse/RMET-3602)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-sqlcipher-adapter",
-  "version": "0.1.7-OS9",
+  "version": "0.1.7-OS10",
   "description": "SQLCipher database adapter for PhoneGap/Cordova, based on cordova-sqlite-storage",
   "cordova": {
     "id": "cordova-sqlcipher-adapter",

plugin.xml

@@ -2,7 +2,7 @@
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
     xmlns:android="http://schemas.android.com/apk/res/android"
     id="cordova-sqlcipher-adapter"
-    version="0.1.7-OS9">
+    version="0.1.7-OS10">
 
     <name>Cordova sqlcipher adapter</name>
 

src/android/io/sqlc/SQLitePlugin.java

@@ -9,9 +9,6 @@
 import android.database.sqlite.SQLiteException;
 import android.util.Log;
 
-import com.outsystems.plugins.oslogger.OSLogger;
-import com.outsystems.plugins.oslogger.interfaces.Logger;
-
 import java.io.File;
 
 import java.lang.IllegalArgumentException;
@@ -56,7 +53,6 @@ public class SQLitePlugin extends CordovaPlugin {
      */
     static Map<String, DBRunner> dbrmap = new ConcurrentHashMap<String, DBRunner>();
 
-    private Logger logger;
     private boolean selfHealingEnabled = false;
     private boolean didTryCipherMigration = false;
 
@@ -74,7 +70,6 @@ public class SQLitePlugin extends CordovaPlugin {
     @Override
     public void initialize(CordovaInterface cordova, CordovaWebView webView) {
         super.initialize(cordova, webView);
-        logger = OSLogger.getInstance();
         selfHealingEnabled = preferences.getBoolean("EnableSQLCipherSelfHealing", false);
         SQLiteAndroidDatabase.initialize();
     }
@@ -252,10 +247,10 @@ private SQLiteAndroidDatabase openDatabase(String dbname, String key, CallbackCo
             return mydb;
         } catch (Exception e) {
 
-            logger.logWarning("Got " + e.getMessage() + " exception.", "SQLite");
+            Log.w("SQLite", "Got " + e.getMessage() + " exception.");
 
             if(mydb != null && !didTryCipherMigration) {
-                logger.logVerbose("Will try Cipher Migration.", "SQLite");
+                Log.v("SQLite", "Will try Cipher Migration.");
                 /*
                  * An error was found and will try to migrate.
                  * The migration process is described here: https://www.zetetic.net/sqlcipher/sqlcipher-api/#cipher_migrate
@@ -270,7 +265,7 @@ private SQLiteAndroidDatabase openDatabase(String dbname, String key, CallbackCo
             if(selfHealingEnabled && (e.getMessage().contains("file is encrypted or is not a database:") ||
                     ((e instanceof SQLiteException) && e.getMessage().contains("file is not a database:") )))
             {
-                logger.logWarning("Android ciphered database will be deleted to self heal: " + e.getMessage(), "SQLite");
+                Log.w("SQLite", "Android ciphered database will be deleted to self heal: " + e.getMessage());
                 deleteDatabaseNow(dbname);
                 return openDatabase(dbname, key, cbc, false);
             } else {

src/ios/SQLitePlugin.m

@@ -7,7 +7,6 @@
  */
 
 #import "SQLitePlugin.h"
-#import "OSLogger.h"
 #import "sqlite3.h"
 
 // Defines Macro to only log lines when in DEBUG mode
@@ -29,7 +28,6 @@ @interface CustomPSPDFThreadSafeMutableDictionary : NSMutableDictionary
 @end
 
 @interface SQLitePlugin()
-@property (nonatomic, readonly, strong) id <OSLoggerProtocol> logger;
 @property (nonatomic, assign, readonly) BOOL selfHealingEnabled;
 @end
 
@@ -47,8 +45,6 @@ -(void)pluginInitialize
     {
         openDBs = [CustomPSPDFThreadSafeMutableDictionary dictionaryWithCapacity:0];
         appDBPaths = [NSMutableDictionary dictionaryWithCapacity:0];
-
-        _logger = [OSLogger sharedInstance];
 
         id selfHealingEnabledValue = [self.commandDelegate.settings objectForKey: [@"EnableSQLCipherSelfHealing" lowercaseString]];
         if (selfHealingEnabledValue != nil) {
@@ -241,7 +237,8 @@ -(void)openNow: (CDVInvokedUrlCommand*)command migrateSqlCipher:(Boolean) migrat
 
                     if(selfHealingEnabled) {
                         [[command.arguments objectAtIndex:0] setObject:dbfilename forKey:@"path"];
-                        [_logger logWarning:[NSString stringWithFormat:@"iOS ciphered database will be deleted to self heal"] withModule:@"SQLite"];
+                        NSLog(@"SQLite: iOS ciphered database will be deleted to self heal");
+                        
                         [self deleteNow:command];
                         return [self openNow:command migrateSqlCipher:false];
                     }