Skip to content

Commit 14d0e3f

Browse files
developernotesdevelopernotes
committed
Use SQLCipher for Android 2.2.1
1 parent 0b86579 commit 14d0e3f

File tree

5 files changed

+46
-49
lines changed

5 files changed

+46
-49
lines changed

‎libs/armeabi/libdatabase_sqlcipher.so‎

136 KB
Binary file not shown.

‎libs/armeabi/libsqlcipher_android.so‎

0 Bytes
Binary file not shown.

‎libs/sqlcipher.jar‎

22 Bytes
Binary file not shown.

‎net.zetetic.sqlcipher.test.iws‎

Lines changed: 45 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -88,18 +88,21 @@
8888
<file leaf-file-name="TestSuiteRunner.java" pinned="false" current="false" current-in-tab="false">
8989
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/TestSuiteRunner.java">
9090
<provider selected="true" editor-type-id="text-editor">
91-
<state line="42" column="66" selection-start="1197" selection-end="1197" vertical-scroll-proportion="0.0">
92-
<folding />
91+
<state line="57" column="34" selection-start="1911" selection-end="1911" vertical-scroll-proportion="0.0">
92+
<folding>
93+
<element signature="imports" expanded="false" />
94+
<element signature="e#1112#1127#0" expanded="false" />
95+
</folding>
9396
</state>
9497
</provider>
9598
</entry>
9699
</file>
97-
<file leaf-file-name="GetTypeFromCrossProcessCursorWrapperTest.java" pinned="false" current="true" current-in-tab="true">
100+
<file leaf-file-name="GetTypeFromCrossProcessCursorWrapperTest.java" pinned="false" current="false" current-in-tab="false">
98101
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/GetTypeFromCrossProcessCursorWrapperTest.java">
99102
<provider selected="true" editor-type-id="text-editor">
100-
<state line="16" column="25" selection-start="679" selection-end="679" vertical-scroll-proportion="0.62882096">
103+
<state line="16" column="25" selection-start="679" selection-end="679" vertical-scroll-proportion="0.0">
101104
<folding>
102-
<element signature="imports" expanded="true" />
105+
<element signature="imports" expanded="false" />
103106
</folding>
104107
</state>
105108
</provider>
@@ -132,10 +135,10 @@
132135
</provider>
133136
</entry>
134137
</file>
135-
<file leaf-file-name="PragmaCipherVersionTest.java" pinned="false" current="false" current-in-tab="false">
138+
<file leaf-file-name="PragmaCipherVersionTest.java" pinned="false" current="true" current-in-tab="true">
136139
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/PragmaCipherVersionTest.java">
137140
<provider selected="true" editor-type-id="text-editor">
138-
<state line="12" column="21" selection-start="319" selection-end="319" vertical-scroll-proportion="0.0">
141+
<state line="16" column="52" selection-start="551" selection-end="551" vertical-scroll-proportion="0.6506024">
139142
<folding />
140143
</state>
141144
</provider>
@@ -173,9 +176,9 @@
173176
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/QueryNonEncryptedDatabaseTest.java" />
174177
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/InvalidPasswordTest.java" />
175178
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/SetLocaleTest.java" />
176-
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/PragmaCipherVersionTest.java" />
177179
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/TestSuiteRunner.java" />
178180
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/GetTypeFromCrossProcessCursorWrapperTest.java" />
181+
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/PragmaCipherVersionTest.java" />
179182
</list>
180183
</option>
181184
</component>
@@ -227,9 +230,10 @@
227230
<option name="LAST_EDITED_TAB_NAME" />
228231
</component>
229232
<component name="ProjectFrameBounds">
233+
<option name="x" value="842" />
230234
<option name="y" value="22" />
231-
<option name="width" value="1920" />
232-
<option name="height" value="1058" />
235+
<option name="width" value="838" />
236+
<option name="height" value="1028" />
233237
</component>
234238
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
235239
<OptionsSetting value="true" id="Add" />
@@ -433,7 +437,7 @@
433437
<recent name="net.zetetic.tests" />
434438
</key>
435439
</component>
436-
<component name="RunManager" selected="Android Application.emulator-4.0.3">
440+
<component name="RunManager" selected="Android Application.emulator-4.1">
437441
<configuration default="true" type="MavenRunConfiguration" factoryName="Maven">
438442
<MavenSettings>
439443
<option name="myGeneralSettings" />
@@ -845,14 +849,14 @@
845849
</todo-panel>
846850
</component>
847851
<component name="ToolWindowManager">
848-
<frame x="0" y="22" width="1920" height="1058" extended-state="0" />
852+
<frame x="842" y="22" width="838" height="1028" extended-state="6" />
849853
<editor active="true" />
850854
<layout>
851855
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
852856
<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" />
853857
<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="5" side_tool="false" content_ui="tabs" />
854858
<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" />
855-
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.49532712" sideWeight="0.0" order="3" side_tool="false" content_ui="tabs" />
859+
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.511254" sideWeight="0.0" order="3" side_tool="false" content_ui="tabs" />
856860
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6307364" sideWeight="0.07692308" order="13" side_tool="true" content_ui="tabs" />
857861
<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" />
858862
<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="9" side_tool="false" content_ui="tabs" />
@@ -862,7 +866,7 @@
862866
<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" />
863867
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32959402" sideWeight="0.65314835" order="4" side_tool="false" content_ui="tabs" />
864868
<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" />
865-
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26822916" sideWeight="0.5046729" order="0" side_tool="false" content_ui="combo" />
869+
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.26822916" sideWeight="0.5046729" order="0" side_tool="false" content_ui="combo" />
866870
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3276414" sideWeight="0.0" order="2" side_tool="false" content_ui="tabs" />
867871
<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" />
868872
<window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32959402" sideWeight="0.4909285" order="3" side_tool="false" content_ui="tabs" />
@@ -939,23 +943,14 @@
939943
<option name="FILTER_TARGETS" value="false" />
940944
</component>
941945
<component name="editorHistoryManager">
942-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/AttachExistingDatabaseTest.java">
943-
<provider selected="true" editor-type-id="text-editor">
944-
<state line="15" column="112" selection-start="456" selection-end="456" vertical-scroll-proportion="0.0">
945-
<folding />
946-
</state>
947-
</provider>
948-
</entry>
949946
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/LoopingQueryTest.java">
950947
<provider selected="true" editor-type-id="text-editor">
951948
<state line="5" column="13" selection-start="120" selection-end="120" vertical-scroll-proportion="0.078947365" />
952949
</provider>
953950
</entry>
954951
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/QueryNonEncryptedDatabaseTest.java">
955952
<provider selected="true" editor-type-id="text-editor">
956-
<state line="9" column="42" selection-start="209" selection-end="238" vertical-scroll-proportion="0.0">
957-
<folding />
958-
</state>
953+
<state line="9" column="42" selection-start="209" selection-end="238" vertical-scroll-proportion="0.0" />
959954
</provider>
960955
</entry>
961956
<entry file="jar://$MAVEN_REPOSITORY$/com/google/android/android/2.1.2/android-2.1.2-sources.jar!/android/content/ContextWrapper.java">
@@ -965,9 +960,7 @@
965960
</entry>
966961
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/FullTextSearchTest.java">
967962
<provider selected="true" editor-type-id="text-editor">
968-
<state line="22" column="12" selection-start="1139" selection-end="1139" vertical-scroll-proportion="0.0">
969-
<folding />
970-
</state>
963+
<state line="22" column="12" selection-start="1139" selection-end="1139" vertical-scroll-proportion="0.0" />
971964
</provider>
972965
</entry>
973966
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/TestSuiteActivity.java">
@@ -979,9 +972,7 @@
979972
</entry>
980973
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/ImportUnencryptedDatabaseTest.java">
981974
<provider selected="true" editor-type-id="text-editor">
982-
<state line="18" column="45" selection-start="595" selection-end="595" vertical-scroll-proportion="0.21978022">
983-
<folding />
984-
</state>
975+
<state line="18" column="45" selection-start="595" selection-end="595" vertical-scroll-proportion="0.21978022" />
985976
</provider>
986977
</entry>
987978
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/ZeteticApplication.java">
@@ -993,16 +984,7 @@
993984
</entry>
994985
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/ReadableWritableAccessTest.java">
995986
<provider selected="true" editor-type-id="text-editor">
996-
<state line="44" column="0" selection-start="1610" selection-end="1610" vertical-scroll-proportion="0.0">
997-
<folding />
998-
</state>
999-
</provider>
1000-
</entry>
1001-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/PragmaCipherVersionTest.java">
1002-
<provider selected="true" editor-type-id="text-editor">
1003-
<state line="12" column="21" selection-start="319" selection-end="319" vertical-scroll-proportion="0.0">
1004-
<folding />
1005-
</state>
987+
<state line="44" column="0" selection-start="1610" selection-end="1610" vertical-scroll-proportion="0.0" />
1006988
</provider>
1007989
</entry>
1008990
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/InvalidPasswordTest.java">
@@ -1026,29 +1008,44 @@
10261008
</state>
10271009
</provider>
10281010
</entry>
1029-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/TestSuiteRunner.java">
1011+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/SQLCipherTest.java">
10301012
<provider selected="true" editor-type-id="text-editor">
1031-
<state line="42" column="66" selection-start="1197" selection-end="1197" vertical-scroll-proportion="0.0">
1013+
<state line="33" column="22" selection-start="1022" selection-end="1022" vertical-scroll-proportion="0.0">
10321014
<folding />
10331015
</state>
10341016
</provider>
10351017
</entry>
1036-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/SQLCipherTest.java">
1018+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/VerifyOnUpgradeIsCalledTest.java">
10371019
<provider selected="true" editor-type-id="text-editor">
1038-
<state line="33" column="22" selection-start="1022" selection-end="1022" vertical-scroll-proportion="0.0">
1039-
<folding />
1040-
</state>
1020+
<state line="8" column="0" selection-start="259" selection-end="259" vertical-scroll-proportion="0.097613886" />
10411021
</provider>
10421022
</entry>
10431023
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/GetTypeFromCrossProcessCursorWrapperTest.java">
10441024
<provider selected="true" editor-type-id="text-editor">
1045-
<state line="16" column="25" selection-start="679" selection-end="679" vertical-scroll-proportion="0.62882096">
1025+
<state line="16" column="25" selection-start="679" selection-end="679" vertical-scroll-proportion="0.0">
1026+
<folding>
1027+
<element signature="imports" expanded="false" />
1028+
</folding>
1029+
</state>
1030+
</provider>
1031+
</entry>
1032+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/TestSuiteRunner.java">
1033+
<provider selected="true" editor-type-id="text-editor">
1034+
<state line="57" column="34" selection-start="1911" selection-end="1911" vertical-scroll-proportion="0.0">
10461035
<folding>
1047-
<element signature="imports" expanded="true" />
1036+
<element signature="imports" expanded="false" />
1037+
<element signature="e#1112#1127#0" expanded="false" />
10481038
</folding>
10491039
</state>
10501040
</provider>
10511041
</entry>
1042+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/PragmaCipherVersionTest.java">
1043+
<provider selected="true" editor-type-id="text-editor">
1044+
<state line="16" column="52" selection-start="551" selection-end="551" vertical-scroll-proportion="0.6506024">
1045+
<folding />
1046+
</state>
1047+
</provider>
1048+
</entry>
10521049
</component>
10531050
<component name="masterDetails">
10541051
<states>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
public class PragmaCipherVersionTest extends SQLCipherTest {
77

8-
private final String CURRENT_CIPHER_VERSION = "2.2.0";
8+
private final String CURRENT_CIPHER_VERSION = "2.2.1";
99

1010
@Override
1111
public boolean execute(SQLiteDatabase database) {

0 commit comments

Comments
 (0)