Skip to content

Commit 389935b

Browse files
developernotesdevelopernotes
committed
New build of SQLCipher for Android (2.0.0-RC6) adding PRAGMA cipher_version test
1 parent feecc0b commit 389935b

File tree

5 files changed

+68
-56
lines changed

5 files changed

+68
-56
lines changed

‎libs/armeabi/libsqlcipher_android.so‎

12.4 KB
Binary file not shown.

‎libs/sqlcipher.jar‎

398 Bytes
Binary file not shown.

‎net.zetetic.sqlcipher.test.iws‎

Lines changed: 41 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -78,25 +78,16 @@
7878
<file leaf-file-name="AttachExistingDatabaseTest.java" pinned="false" current="false" current-in-tab="false">
7979
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/AttachExistingDatabaseTest.java">
8080
<provider selected="true" editor-type-id="text-editor">
81-
<state line="9" column="55" selection-start="251" selection-end="251" vertical-scroll-proportion="0.0">
81+
<state line="16" column="79" selection-start="508" selection-end="508" vertical-scroll-proportion="0.0">
8282
<folding />
8383
</state>
8484
</provider>
8585
</entry>
8686
</file>
87-
<file leaf-file-name="SQLCipherTest.java" pinned="false" current="false" current-in-tab="false">
88-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/SQLCipherTest.java">
87+
<file leaf-file-name="PragmaCipherVersionTest.java" pinned="false" current="true" current-in-tab="true">
88+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/PragmaCipherVersionTest.java">
8989
<provider selected="true" editor-type-id="text-editor">
90-
<state line="8" column="22" selection-start="183" selection-end="183" vertical-scroll-proportion="0.0">
91-
<folding />
92-
</state>
93-
</provider>
94-
</entry>
95-
</file>
96-
<file leaf-file-name="MigrationFromDatabaseFormat1To2.java" pinned="false" current="true" current-in-tab="true">
97-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/MigrationFromDatabaseFormat1To2.java">
98-
<provider selected="true" editor-type-id="text-editor">
99-
<state line="19" column="88" selection-start="774" selection-end="774" vertical-scroll-proportion="0.2967033">
90+
<state line="12" column="71" selection-start="369" selection-end="369" vertical-scroll-proportion="0.21758242">
10091
<folding />
10192
</state>
10293
</provider>
@@ -112,8 +103,6 @@
112103
<component name="IdeDocumentHistory">
113104
<option name="changedFiles">
114105
<list>
115-
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/LoopingQueryTest.java" />
116-
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/CanThrowSQLiteExceptionTest.java" />
117106
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/RawExecTest.java" />
118107
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/RawExecExceptionTest.java" />
119108
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/RawExecSQLExceptionTest.java" />
@@ -127,6 +116,8 @@
127116
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/AttachExistingDatabaseTest.java" />
128117
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/AttachNewDatabaseTest.java" />
129118
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/StatusMemoryUsedTest.java" />
119+
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/DemoTest.java" />
120+
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/PragmaCipherVersionTest.java" />
130121
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/TestSuiteRunner.java" />
131122
</list>
132123
</option>
@@ -392,7 +383,7 @@
392383
<recent name="net.zetetic.tests" />
393384
</key>
394385
</component>
395-
<component name="RunManager" selected="Android Application.emulator-4.0.3">
386+
<component name="RunManager" selected="Android Application.emulator-2.1">
396387
<configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
397388
<module name="" />
398389
<option name="TESTING_TYPE" value="0" />
@@ -731,17 +722,17 @@
731722
<window_info id="JetGradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
732723
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
733724
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
734-
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3276414" sideWeight="0.0" order="3" side_tool="false" content_ui="tabs" />
725+
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.48986125" sideWeight="0.0" order="3" side_tool="false" content_ui="tabs" />
735726
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="12" side_tool="true" content_ui="tabs" />
736727
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
737728
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
738-
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32262212" sideWeight="0.46650276" order="9" side_tool="false" content_ui="tabs" />
729+
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32230523" sideWeight="0.46650276" order="9" side_tool="false" content_ui="tabs" />
739730
<window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7427962" sideWeight="0.9230769" order="7" side_tool="false" content_ui="tabs" />
740731
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32800853" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
741732
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
742733
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
743734
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
744-
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32959402" sideWeight="0.6723586" order="0" side_tool="false" content_ui="combo" />
735+
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24252136" sideWeight="0.51013875" order="0" side_tool="false" content_ui="combo" />
745736
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32800853" sideWeight="0.0" order="2" side_tool="false" content_ui="tabs" />
746737
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
747738
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -811,90 +802,84 @@
811802
<option name="FILTER_TARGETS" value="false" />
812803
</component>
813804
<component name="editorHistoryManager">
814-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/NullQueryResultTest.java">
815-
<provider selected="true" editor-type-id="text-editor">
816-
<state line="0" column="26" selection-start="0" selection-end="26" vertical-scroll-proportion="0.0" />
817-
</provider>
818-
</entry>
819805
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/ResultNotifier.java">
820806
<provider selected="true" editor-type-id="text-editor">
821807
<state line="4" column="20" selection-start="116" selection-end="116" vertical-scroll-proportion="0.078947365" />
822808
</provider>
823809
</entry>
824-
<entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
810+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/ZeteticContentProvider.java">
825811
<provider selected="true" editor-type-id="text-editor">
826-
<state line="16" column="0" selection-start="814" selection-end="814" vertical-scroll-proportion="0.31578946" />
812+
<state line="29" column="0" selection-start="743" selection-end="743" vertical-scroll-proportion="0.43421054" />
827813
</provider>
828814
</entry>
829-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/LoopingQueryTest.java">
815+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/AES128CipherTest.java">
830816
<provider selected="true" editor-type-id="text-editor">
831-
<state line="11" column="45" selection-start="312" selection-end="331" vertical-scroll-proportion="0.19736843" />
817+
<state line="34" column="61" selection-start="1025" selection-end="1025" vertical-scroll-proportion="0.58651686" />
832818
</provider>
833819
</entry>
834-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/ZeteticContentProvider.java">
820+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/ZeteticApplication.java">
835821
<provider selected="true" editor-type-id="text-editor">
836-
<state line="29" column="0" selection-start="743" selection-end="743" vertical-scroll-proportion="0.43421054" />
822+
<state line="37" column="5" selection-start="986" selection-end="986" vertical-scroll-proportion="0.40789473" />
837823
</provider>
838824
</entry>
839-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/AES128CipherTest.java">
825+
<entry file="jar://$MAVEN_REPOSITORY$/com/google/android/android/2.1.2/android-2.1.2.jar!/android/os/AsyncTask.class">
840826
<provider selected="true" editor-type-id="text-editor">
841-
<state line="34" column="61" selection-start="1025" selection-end="1025" vertical-scroll-proportion="0.58651686" />
827+
<state line="42" column="0" selection-start="1843" selection-end="1843" vertical-scroll-proportion="0.52840906" />
842828
</provider>
843829
</entry>
844-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/AttachNewDatabaseTest.java">
830+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/RawExecSQLTest.java">
845831
<provider selected="true" editor-type-id="text-editor">
846-
<state line="32" column="5" selection-start="1294" selection-end="1294" vertical-scroll-proportion="0.57236844" />
832+
<state line="9" column="13" selection-start="241" selection-end="241" vertical-scroll-proportion="0.15824176" />
847833
</provider>
848834
</entry>
849-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/ZeteticApplication.java">
835+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/MigrationFromDatabaseFormat1To2.java">
850836
<provider selected="true" editor-type-id="text-editor">
851-
<state line="37" column="5" selection-start="986" selection-end="986" vertical-scroll-proportion="0.40789473" />
837+
<state line="25" column="31" selection-start="1069" selection-end="1069" vertical-scroll-proportion="0.41538462" />
852838
</provider>
853839
</entry>
854-
<entry file="jar://$PROJECT_DIR$/libs/sqlcipher.jar!/net/sqlcipher/database/SQLiteDatabase.class">
840+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/LoopingQueryTest.java">
855841
<provider selected="true" editor-type-id="text-editor">
856-
<state line="67" column="23" selection-start="3611" selection-end="3611" vertical-scroll-proportion="0.34442836" />
842+
<state line="15" column="14" selection-start="517" selection-end="517" vertical-scroll-proportion="0.35492957" />
857843
</provider>
858844
</entry>
859-
<entry file="jar://$MAVEN_REPOSITORY$/com/google/android/android/2.1.2/android-2.1.2.jar!/android/os/AsyncTask.class">
845+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/AttachNewDatabaseTest.java">
860846
<provider selected="true" editor-type-id="text-editor">
861-
<state line="42" column="0" selection-start="1843" selection-end="1843" vertical-scroll-proportion="0.52840906" />
847+
<state line="25" column="20" selection-start="1107" selection-end="1107" vertical-scroll-proportion="0.43516484" />
862848
</provider>
863849
</entry>
864-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/AttachExistingDatabaseTest.java">
850+
<entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
865851
<provider selected="true" editor-type-id="text-editor">
866-
<state line="9" column="55" selection-start="251" selection-end="251" vertical-scroll-proportion="0.0" />
852+
<state line="16" column="0" selection-start="814" selection-end="814" vertical-scroll-proportion="0.6385809" />
867853
</provider>
868854
</entry>
869-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/SQLCipherTest.java">
855+
<entry file="jar://$PROJECT_DIR$/libs/sqlcipher.jar!/net/sqlcipher/database/SQLiteDatabase.class">
870856
<provider selected="true" editor-type-id="text-editor">
871-
<state line="8" column="22" selection-start="183" selection-end="183" vertical-scroll-proportion="0.0" />
857+
<state line="63" column="15" selection-start="3330" selection-end="3330" vertical-scroll-proportion="0.34235293" />
872858
</provider>
873859
</entry>
874860
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/StatusMemoryUsedTest.java">
875861
<provider selected="true" editor-type-id="text-editor">
876-
<state line="14" column="31" selection-start="485" selection-end="485" vertical-scroll-proportion="0.2837838">
877-
<folding />
878-
</state>
862+
<state line="15" column="42" selection-start="577" selection-end="577" vertical-scroll-proportion="0.2967033" />
879863
</provider>
880864
</entry>
881865
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/TestSuiteRunner.java">
882866
<provider selected="true" editor-type-id="text-editor">
883-
<state line="51" column="42" selection-start="1610" selection-end="1610" vertical-scroll-proportion="0.8021978">
884-
<folding />
885-
</state>
867+
<state line="53" column="28" selection-start="1697" selection-end="1697" vertical-scroll-proportion="0.8021978" />
886868
</provider>
887869
</entry>
888-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/RawExecSQLTest.java">
870+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/SQLCipherTest.java">
889871
<provider selected="true" editor-type-id="text-editor">
890-
<state line="9" column="13" selection-start="241" selection-end="241" vertical-scroll-proportion="0.15824176">
891-
<folding />
892-
</state>
872+
<state line="39" column="5" selection-start="1106" selection-end="1106" vertical-scroll-proportion="0.6923077" />
893873
</provider>
894874
</entry>
895-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/MigrationFromDatabaseFormat1To2.java">
875+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/AttachExistingDatabaseTest.java">
876+
<provider selected="true" editor-type-id="text-editor">
877+
<state line="16" column="79" selection-start="508" selection-end="508" vertical-scroll-proportion="0.0" />
878+
</provider>
879+
</entry>
880+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/PragmaCipherVersionTest.java">
896881
<provider selected="true" editor-type-id="text-editor">
897-
<state line="19" column="88" selection-start="774" selection-end="774" vertical-scroll-proportion="0.2967033">
882+
<state line="12" column="71" selection-start="369" selection-end="369" vertical-scroll-proportion="0.21758242">
898883
<folding />
899884
</state>
900885
</provider>

‎src/main/java/net/zetetic/tests/PragmaCipherVersionTest.java‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package net.zetetic.tests;
2+
3+
import android.database.Cursor;
4+
import net.sqlcipher.database.SQLiteDatabase;
5+
6+
public class PragmaCipherVersionTest extends SQLCipherTest {
7+
8+
private final String CURRENT_CIPHER_VERSION = "2.0.5";
9+
10+
@Override
11+
public boolean execute(SQLiteDatabase database) {
12+
13+
Cursor cursor = database.rawQuery("PRAGMA cipher_version", new String[]{});
14+
if(cursor != null){
15+
cursor.moveToNext();
16+
String cipherVersion = cursor.getString(0);
17+
return cipherVersion.equals(CURRENT_CIPHER_VERSION);
18+
}
19+
return false;
20+
}
21+
22+
@Override
23+
public String getName() {
24+
return "PRAGMA cipher_version Test";
25+
}
26+
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ private List<SQLCipherTest> getTestsToRun(){
5252
tests.add(new AES128CipherTest());
5353
tests.add(new MigrationFromDatabaseFormat1To2());
5454
tests.add(new StatusMemoryUsedTest());
55+
tests.add(new PragmaCipherVersionTest());
5556
return tests;
5657
}
5758
}

0 commit comments

Comments
 (0)