54 lines
1.6 KiB
Diff
54 lines
1.6 KiB
Diff
--- a/src/crypto.h 2022-02-28 20:11:16.000000000 +0000
|
|
+++ b/src/crypto.h 2022-04-15 22:46:24.166211467 +0000
|
|
@@ -39,10 +39,6 @@
|
|
#include "btreeInt.h"
|
|
#include "pager.h"
|
|
|
|
-#ifdef __ANDROID__
|
|
-#include <android/log.h>
|
|
-#endif
|
|
-
|
|
/* extensions defined in pager.c */
|
|
void *sqlite3PagerGetCodec(Pager*);
|
|
void sqlite3PagerSetCodec(Pager*, void *(*)(void*,void*,Pgno,int), void (*)(void*,int,int), void (*)(void*), void *);
|
|
--- a/src/crypto_impl.c 2022-02-28 20:11:16.000000000 +0000
|
|
+++ b/src/crypto_impl.c 2022-04-15 23:00:47.610944833 +0000
|
|
@@ -1660,11 +1660,6 @@
|
|
FILE *f = (FILE*) file;
|
|
char *fmt = "Elapsed time:%.3f ms - %s\n";
|
|
double elapsed = (*((sqlite3_uint64*)run_time))/1000000.0;
|
|
-#ifdef __ANDROID__
|
|
- if(f == NULL) {
|
|
- __android_log_print(ANDROID_LOG_DEBUG, "sqlcipher", fmt, elapsed, sqlite3_sql((sqlite3_stmt*)stmt));
|
|
- }
|
|
-#endif
|
|
if(f) fprintf(f, fmt, elapsed, sqlite3_sql((sqlite3_stmt*)stmt));
|
|
return SQLITE_OK;
|
|
}
|
|
@@ -1714,13 +1709,9 @@
|
|
va_start(params, message);
|
|
|
|
#ifdef CODEC_DEBUG
|
|
-#ifdef __ANDROID__
|
|
- __android_log_vprint(ANDROID_LOG_DEBUG, "sqlcipher", message, params);
|
|
-#else
|
|
vfprintf(stderr, message, params);
|
|
fprintf(stderr, "\n");
|
|
#endif
|
|
-#endif
|
|
|
|
if(level > sqlcipher_log_level || (sqlcipher_log_logcat == 0 && sqlcipher_log_file == NULL)) {
|
|
/* no log target or tag not in included filters */
|
|
@@ -1752,11 +1743,6 @@
|
|
fprintf((FILE*)sqlcipher_log_file, "\n");
|
|
}
|
|
}
|
|
-#ifdef __ANDROID__
|
|
- if(sqlcipher_log_logcat) {
|
|
- __android_log_vprint(ANDROID_LOG_DEBUG, "sqlcipher", message, params);
|
|
- }
|
|
-#endif
|
|
end:
|
|
va_end(params);
|
|
}
|