Merge branch 'master' into minor-build-updates-2023-01

Author: Chris Brody

app/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-  compileSdkVersion 30
+  compileSdkVersion 33
 
   defaultConfig {
     applicationId "net.zetetic.sqlcipher.test"
     minSdkVersion 16
-    targetSdkVersion 30
+    targetSdkVersion 33
     versionCode 1
     versionName "1.0"
   }
@@ -23,10 +23,10 @@ dependencies {
   // implementation files('libs/sqlcipher.jar')
 
   // For testing local AAR packages:
-  //implementation (name: 'android-database-sqlcipher-4.5.3-release', ext: 'aar')
+  implementation (name: 'android-database-sqlcipher-4.5.3-release', ext: 'aar')
 
   // For testing on remote AAR references:
-  implementation 'net.zetetic:android-database-sqlcipher:4.5.3@aar'
+  //implementation 'net.zetetic:android-database-sqlcipher:4.5.3@aar'
 
   implementation "androidx.sqlite:sqlite:2.1.0"
 

app/src/main/AndroidManifest.xml

@@ -7,6 +7,7 @@
                  android:label="@string/app_name"
                  android:name="ZeteticApplication">
         <activity android:name=".activities.TestRunnerSelectionActivity"
+                  android:exported="true"
                   android:keepScreenOn="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>

app/src/main/java/net/zetetic/QueryHelper.java

@@ -3,9 +3,24 @@
 import android.database.Cursor;
 import androidx.sqlite.db.SupportSQLiteDatabase;
 
+import java.util.ArrayList;
+import java.util.List;
+
 
 public class QueryHelper {
 
+    public static List<String> getListFromQuery(SupportSQLiteDatabase database, String query){
+        Cursor cursor = database.query(query, new String[]{});
+        List<String> results = new ArrayList<>();
+        if(cursor != null){
+            while(cursor.moveToNext()){
+                results.add(cursor.getString(0));
+            }
+            cursor.close();
+        }
+        return results;
+    }
+
     public static String singleValueFromQuery(SupportSQLiteDatabase database, String query){
         Cursor cursor = database.query(query, new String[]{});
         String value = "";

app/src/main/java/net/zetetic/ZeteticApplication.java

@@ -121,7 +121,7 @@ public void postKey(SQLiteDatabase database) {
   SQLiteDatabaseHook keyHook = new SQLiteDatabaseHook() {
     @Override
     public void preKey(SQLiteDatabase database) {
-      //database.rawExecSQL("PRAGMA cipher_license = '';");
+      database.rawExecSQL("PRAGMA cipher_license = '';");
     }
     public void postKey(SQLiteDatabase database) {
     }

app/src/main/java/net/zetetic/tests/TestSuiteRunner.java

@@ -69,13 +69,10 @@ private void runSuite() {
 
   private List<SQLCipherTest> getTestsToRun() {
     List<SQLCipherTest> tests = new ArrayList<>();
-
     tests.add(new SummingStepTest());
-
     tests.add(new JsonCastTest());
     tests.add(new SimpleQueryTest());
     tests.add(new DefaultCursorWindowAllocationTest());
-
     tests.add(new DeleteTableWithNullWhereArgsTest());
     tests.add(new LoopingInsertTest());
     tests.add(new FIPSTest());
@@ -193,7 +190,6 @@ private List<SQLCipherTest> getTestsToRun() {
     tests.add(new BindByteArrayRawQueryTest());
     tests.add(new NullRawQueryTest());
     tests.add(new ReadWriteDatabaseToExternalStorageTest());
-
     return tests;
   }
 }

app/src/main/java/net/zetetic/tests/support/EncryptBytesTest.java

@@ -17,6 +17,7 @@
 import net.zetetic.ZeteticApplication;
 import net.zetetic.tests.TestResult;
 
+import java.io.File;
 import java.security.SecureRandom;
 import java.util.Arrays;
 import java.util.Random;
@@ -103,7 +104,11 @@ public TestResult run() {
     TestResult result = new TestResult(getName(), false);
     byte[] passphrase = SQLiteDatabase.getBytes(ZeteticApplication.DATABASE_PASSWORD.toCharArray());
     SupportFactory factory = new SupportFactory(passphrase, ZeteticApplication.getInstance().wrapHook(null));
-    BlobDatabase room = Room.databaseBuilder(activity, BlobDatabase.class, "test.db")
+    File databaseFile = ZeteticApplication.getInstance().getDatabasePath("test.db");
+    if(databaseFile.exists()) {
+      databaseFile.delete();
+    }
+    BlobDatabase room = Room.databaseBuilder(activity, BlobDatabase.class, databaseFile.getAbsolutePath())
         .openHelperFactory(factory)
         .build();