8000 Merge branch 'master' of https://github.com/amplify-education/android… · calow/android-database-sqlcipher@ce580b5 · GitHub
[go: up one dir, main page]
Skip to content

Commit ce580b5

Browse files
developernotesdevelopernotes
committed
Merge branch 'master' of https://github.com/amplify-education/android-database-sqlcipher into amplify-education-master
2 parents 8986d64 + 4aa74ca commit ce580b5

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

‎src/net/sqlcipher/database/SQLiteDatabase.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1433,10 +1433,8 @@ public Cursor rawQueryWithFactory(
14331433

14341434
if (Config.LOGV || duration >= mSlowQueryThreshold) {
14351435
Log.v(TAG,
1436-
"query (" + duration + " ms): " + driver.toString() + ", args are "
1437-
+ (selectionArgs != null
1438-
? TextUtils.join(",", selectionArgs)
1439-
: "<null>") + ", count is " + count);
1436+
"query (" + duration + " ms): " + driver.toString() +
1437+
", args are <redacted>, count is " + count);
14401438
}
14411439
}
14421440
}
@@ -1486,7 +1484,7 @@ public long insert(String table, String nullColumnHack, ContentValues values) {
14861484
try {
14871485
return insertWithOnConflict(table, nullColumnHack, values, CONFLICT_NONE);
14881486
} catch (SQLException e) {
1489-
Log.e(TAG, "Error inserting " + values, e);
1487+
Log.e(TAG, "Error inserting <redacted values> into " + table, e);
14901488
return -1;
14911489
}
14921490
}
@@ -1525,7 +1523,7 @@ public long replace(String table, String nullColumnHack, ContentValues initialVa
15251523
return insertWithOnConflict(table, nullColumnHack, initialValues,
15261524
CONFLICT_REPLACE);
15271525
} catch (SQLException e) {
1528-
Log.e(TAG, "Error inserting " + initialValues, e);
1526+
Log.e(TAG, "Error inserting <redacted values> into " + table, e);
15291527
return -1;
15301528
}
15311529
}
@@ -1628,11 +1626,11 @@ public long insertWithOnConflict(String table, String nullColumnHack,
16281626

16291627
long insertedRowId = lastInsertRow();
16301628
if (insertedRowId == -1) {
1631-
Log.e(TAG, "Error inserting " + initialValues + " using " + sql);
1629+
Log.e(TAG, "Error inserting <redacted values> using <redacted sql> into " + table);
16321630
} else {
16331631
if (Config.LOGD && Log.isLoggable(TAG, Log.VERBOSE)) {
1634-
Log.v(TAG, "Inserting row " + insertedRowId + " from "
1635-
+ initialValues + " using " + sql);
1632+
Log.v(TAG, "Inserting row " + insertedRowId +
1633+
" from <redacted values> using <redacted sql> into " + table);
16361634
}
16371635
}
16381636
return insertedRowId;
@@ -1770,14 +1768,15 @@ public int updateWithOnConflict(String table, ContentValues values,
17701768
statement.execute();
17711769
int numChangedRows = lastChangeCount();
17721770
if (Config.LOGD && Log.isLoggable(TAG, Log.VERBOSE)) {
1773-
Log.v(TAG, "Updated " + numChangedRows + " using " + values + " and " + sql);
1771+
Log.v(TAG, "Updated " + numChangedRows +
1772+
" rows using <redacted values> and <redacted sql> for " + table);
17741773
}
17751774
return numChangedRows;
17761775
} catch (SQLiteDatabaseCorruptException e) {
17771776
onCorruption();
17781777
throw e;
17791778
} catch (SQLException e) {
1780-
Log.e(TAG, "Error updating " + values + " using " + sql);
1779+
Log.e(TAG, "Error updating <redacted values> using <redacted sql> for " + table);
17811780
throw e;
17821781
} finally {
17831782
if (statement != null) {

0 commit comments

Comments
 (0)
0