Merge branch 'karanpopali' into prerelease

Author: developernotes

AndroidManifest.xml

@@ -10,6 +10,9 @@
             </intent-filter>
         </activity>
         <provider android:name=".ZeteticContentProvider" android:authorities="net.zetetic.sqlcipher.zeteticprovider" />
+
+        <provider android:name=".ZeteticContentProvider2" android:authorities="net.zetetic.sqlcipher.zeteticprovider2"
+            android:process=":provider" />
     </application>
     <uses-permission android:name="android.permission.READ_CONTACTS" />
 </manifest>

src/main/java/net/zetetic/ZeteticContentProvider2.java

@@ -0,0 +1,70 @@
+package net.zetetic;
+
+import java.io.File;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+
+import net.sqlcipher.database.SQLiteDatabase;
+import net.sqlcipher.database.SQLiteQueryBuilder;
+
+public class ZeteticContentProvider2 extends ContentProvider {
+
+    public static String DATABASE_NAME = "interprocess_test.db";
+    public static final Uri CONTENT_URI =
+            Uri.parse("content://net.zetetic.sqlcipher.zeteticprovider2");
+
+    private SQLiteDatabase database;
+
+    public ZeteticContentProvider2() {
+
+    }
+
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
+
+        SQLiteDatabase.loadLibs(ZeteticApplication.getInstance());
+        File databasePath = ZeteticApplication.getInstance().getDatabasePath(DATABASE_NAME);
+        database = ZeteticApplication.getInstance().createDatabase(databasePath);
+
+        createDatabaseWithData(database);
+        SQLiteQueryBuilder builder = new SQLiteQueryBuilder();
+        builder.setTables("t1");
+        return builder.query(database, new String[]{"a", "b"}, null, null, null, null, null);
+    }
+
+    @Override
+    public String getType(Uri uri) {
+        return null;
+    }
+
+    @Override
+    public Uri insert(Uri uri, ContentValues contentValues) {
+        return null;
+    }
+
+    @Override
+    public int delete(Uri uri, String s, String[] strings) {
+        return 0;
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues contentValues, String s, String[] strings) {
+        return 0;
+    }
+
+    private void createDatabaseWithData(SQLiteDatabase database) {
+        database.execSQL("create table if not exists t1(a varchar, b blob);");
+        ContentValues values = new ContentValues();
+        values.put("a", "one for the money");
+        values.put("b", "two for the show".getBytes());
+        database.insert("t1", null, values);
+    }
+}

src/main/java/net/zetetic/tests/InterprocessBlobQueryTest.java

@@ -0,0 +1,33 @@
+package net.zetetic.tests;
+
+import android.app.Activity;
+import android.net.Uri;
+
+import net.sqlcipher.database.SQLiteDatabase;
+import net.zetetic.ZeteticApplication;
+import net.zetetic.ZeteticContentProvider2;
+
+public class InterprocessBlobQueryTest extends SQLCipherTest {
+
+    @Override
+    public boolean execute(SQLiteDatabase database) {
+
+        Activity activity = ZeteticApplication.getInstance().getCurrentActivity();
+        Uri providerUri = ZeteticContentProvider2.CONTENT_URI;
+        android.database.Cursor cursor = activity.managedQuery(providerUri, null, null, null, null);
+        StringBuilder buffer = new StringBuilder();
+        while (cursor.moveToNext()) {
+            buffer.append(cursor.getString(0));
+            buffer.append(new String(cursor.getBlob(1)));
+        }
+        cursor.close();
+        return buffer.toString().length() > 0;
+    }
+
+
+
+    @Override
+    public String getName() {
+        return "Custom Inter-Process Blob Test";
+    }
+}

src/main/java/net/zetetic/tests/RawRekeyTest.java

@@ -0,0 +1,26 @@
+package net.zetetic.tests;
+
+import net.sqlcipher.database.SQLiteDatabase;
+import net.zetetic.ZeteticApplication;
+
+import java.io.File;
+
+public class RawRekeyTest extends SQLCipherTest {
+
+    String password = "x\'2DD29CA851E7B56E4697B0E1F08507293D761A05CE4D1B628663F411A8086D99\'";
+    String rekeyCommand = String.format("PRAGMA rekey  = \"%s\";", password);
+    File databaseFile = ZeteticApplication.getInstance().getDatabasePath(ZeteticApplication.DATABASE_NAME);
+
+    @Override
+    public boolean execute(SQLiteDatabase database) {
+        database.rawExecSQL(rekeyCommand);
+        database.close();
+        database = SQLiteDatabase.openOrCreateDatabase(databaseFile, password, null);
+        return database != null;
+    }
+
+    @Override
+    public String getName() {
+        return "Raw Rekey Test";
+    }
+}

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

@@ -44,6 +44,7 @@ private List<SQLCipherTest> getTestsToRun(){
         tests.add(new InvalidPasswordTest());
         tests.add(new NullQueryResultTest());
         tests.add(new CrossProcessCursorQueryTest());
+        tests.add(new InterprocessBlobQueryTest());
         tests.add(new LoopingQueryTest());
         tests.add(new LoopingCountQueryTest());
         tests.add(new AttachNewDatabaseTest());
@@ -68,6 +69,7 @@ private List<SQLCipherTest> getTestsToRun(){
         tests.add(new QueryNonEncryptedDatabaseTest());
         tests.add(new EnableForeignKeySupportTest());
         tests.add(new AverageOpenTimeTest());
+        tests.add(new RawRekeyTest());
         return tests;
     }
 }