Skip to content

Commit 0374b2e

Browse files
developernotesdevelopernotes
committed
New build with SQLCipher for Android, adjust cursor
1 parent 241c3aa commit 0374b2e

File tree

3 files changed

+69
-48
lines changed

3 files changed

+69
-48
lines changed

‎libs/sqlcipher.jar‎

-326 Bytes
Binary file not shown.

‎net.zetetic.sqlcipher.test.iws‎

Lines changed: 68 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<list default="true" id="cccb5bfe-eb2a-4282-b2df-29e914014eae" name="Default" comment="" />
2828
<ignored path="net.zetetic.sqlcipher.test.iws" />
2929
<ignored path=".idea/workspace.xml" />
30-
<file path="/fragment.java" changelist="cccb5bfe-eb2a-4282-b2df-29e914014eae" time="1376512590656" ignored="false" />
30+
<file path="/fragment.java" changelist="cccb5bfe-eb2a-4282-b2df-29e914014eae" time="1380220069230" ignored="false" />
3131
<file path="/QueryNonEncryptedDatabaseTest.java" changelist="cccb5bfe-eb2a-4282-b2df-29e914014eae" time="1360768313829" ignored="false" />
3232
<file path="/TestSuiteRunner.java" changelist="cccb5bfe-eb2a-4282-b2df-29e914014eae" time="1373906113550" ignored="false" />
3333
<file path="$PROJECT_DIR$/../strip-android/src/net/zetetic/strip/helpers/SQLCipherDatabaseConnection.java" changelist="cccb5bfe-eb2a-4282-b2df-29e914014eae" time="1364912317293" ignored="false" />
@@ -44,6 +44,7 @@
4444
<file path="/test_result_row.xml" changelist="cccb5bfe-eb2a-4282-b2df-29e914014eae" time="1373906953089" ignored="false" />
4545
<file path="/TestResult.java" changelist="cccb5bfe-eb2a-4282-b2df-29e914014eae" time="1373907274771" ignored="false" />
4646
<file path="/TestResultAdapter.java" changelist="cccb5bfe-eb2a-4282-b2df-29e914014eae" time="1373907767672" ignored="false" />
47+
<file path="/PragmaCipherVersionTest.java" changelist="cccb5bfe-eb2a-4282-b2df-29e914014eae" time="1380210516107" ignored="false" />
4748
<option name="TRACKING_ENABLED" value="true" />
4849
<option name="SHOW_DIALOG" value="false" />
4950
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -59,7 +60,6 @@
5960
</component>
6061
<component name="DebuggerManager">
6162
<line_breakpoints default_suspend_policy="SuspendAll" default_condition_enabled="true" />
62-
<ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
6363
<breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">
6464
<breakpoint>
6565
<option name="NOTIFY_CAUGHT" value="true" />
@@ -96,6 +96,7 @@
9696
<option name="LOG_MESSAGE" value="" />
9797
</breakpoint>
9898
</breakpoint_any>
99+
<ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
99100
<breakpoint_rules />
100101
<ui_properties />
101102
</component>
@@ -108,7 +109,7 @@
108109
<file leaf-file-name="TestSuiteRunner.java" pinned="false" current="false" current-in-tab="false">
109110
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/TestSuiteRunner.java">
110111
<provider selected="true" editor-type-id="text-editor">
111-
<state line="69" column="38" selection-start="2534" selection-end="2534" vertical-scroll-proportion="0.0">
112+
<state line="46" column="51" selection-start="1395" selection-end="1395" vertical-scroll-proportion="0.0">
112113
<folding />
113114
</state>
114115
</provider>
@@ -117,7 +118,16 @@
117118
<file leaf-file-name="PragmaCipherVersionTest.java" pinned="false" current="true" current-in-tab="true">
118119
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/PragmaCipherVersionTest.java">
119120
<provider selected="true" editor-type-id="text-editor">
120-
<state line="10" column="24" selection-start="267" selection-end="267" vertical-scroll-proportion="0.97590363">
121+
<state line="15" column="34" selection-start="477" selection-end="477" vertical-scroll-proportion="0.672">
122+
<folding />
123+
</state>
124+
</provider>
125+
</entry>
126+
</file>
127+
<file leaf-file-name="InterprocessBlobQueryTest.java" pinned="false" current="false" current-in-tab="false">
128+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/InterprocessBlobQueryTest.java">
129+
<provider selected="true" editor-type-id="text-editor">
130+
<state line="9" column="13" selection-start="225" selection-end="225" vertical-scroll-proportion="0.0">
121131
<folding />
122132
</state>
123133
</provider>
@@ -171,15 +181,6 @@
171181
</provider>
172182
</entry>
173183
</file>
174-
<file leaf-file-name="ZeteticApplication.java" pinned="false" current="false" current-in-tab="false">
175-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/ZeteticApplication.java">
176-
<provider selected="true" editor-type-id="text-editor">
177-
<state line="35" column="16" selection-start="984" selection-end="984" vertical-scroll-proportion="0.0">
178-
<folding />
179-
</state>
180-
</provider>
181-
</entry>
182-
</file>
183184
</leaf>
184185
</component>
185186
<component name="FindManager">
@@ -193,7 +194,6 @@
193194
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/InvalidPasswordTest.java" />
194195
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/SetLocaleTest.java" />
195196
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/GetTypeFromCrossProcessCursorWrapperTest.java" />
196-
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/PragmaCipherVersionTest.java" />
197197
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/MigrationFromDatabaseFormat1To2.java" />
198198
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/AttachExistingDatabaseTest.java" />
199199
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/ExportToUnencryptedDatabase.java" />
@@ -206,6 +206,7 @@
206206
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/TestSuiteRunner.java" />
207207
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/MigrateDatabaseFrom1xFormatToCurrentFormat.java" />
208208
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/AttachNewDatabaseTest.java" />
209+
<option value="$PROJECT_DIR$/src/main/java/net/zetetic/tests/PragmaCipherVersionTest.java" />
209210
</list>
210211
</option>
211212
</component>
@@ -259,7 +260,7 @@
259260
<component name="ProjectFrameBounds">
260261
<option name="y" value="22" />
261262
<option name="width" value="1920" />
262-
<option name="height" value="1058" />
263+
<option name="height" value="1028" />
263264
</component>
264265
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
265266
<OptionsSetting value="true" id="Add" />
@@ -287,6 +288,7 @@
287288
<sortByType />
288289
</navigator>
289290
<panes>
291+
<pane id="Scope" />
290292
<pane id="ProjectPane">
291293
<subPane>
292294
<PATH>
@@ -395,7 +397,6 @@
395397
</PATH>
396398
</subPane>
397399
</pane>
398-
<pane id="Scope" />
399400
<pane id="PackagesPane" />
400401
<pane id="Favorites" />
401402
</panes>
@@ -439,7 +440,7 @@
439440
<recent name="net.zetetic.tests" />
440441
</key>
441442
</component>
442-
<component name="RunManager" selected="Android Application.emulator-2.1">
443+
<component name="RunManager" selected="Android Application.emulator-4.3">
443444
<configuration default="true" type="MavenRunConfiguration" factoryName="Maven">
444445
<MavenSettings>
445446
<option name="myGeneralSettings" />
@@ -783,7 +784,25 @@
783784
<ConfigurationWrapper RunnerId="AndroidDebugRunner" />
784785
<method />
785786
</configuration>
786-
<list size="12">
787+
<configuration default="false" name="emulator-4.3" type="AndroidRunConfigurationType" factoryName="Android Application">
788+
<module name="net.zetetic.sqlcipher.test" />
789+
<option name="ACTIVITY_CLASS" value="" />
790+
<option name="MODE" value="default_activity" />
791+
<option name="DEPLOY" value="true" />
792+
<option name="TARGET_SELECTION_MODE" value="EMULATOR" />
793+
<option name="PREFERRED_AVD" value="emulator-4.3" />
794+
<option name="USE_COMMAND_LINE" value="true" />
795+
<option name="COMMAND_LINE" value="" />
796+
<option name="WIPE_USER_DATA" value="false" />
797+
<option name="DISABLE_BOOT_ANIMATION" value="false" />
798+
<option name="NETWORK_SPEED" value="full" />
799+
<option name="NETWORK_LATENCY" value="none" />
800+
<option name="CLEAR_LOGCAT" value="false" />
801+
<RunnerSettings RunnerId="AndroidDebugRunner" />
802+
<ConfigurationWrapper RunnerId="AndroidDebugRunner" />
803+
<method />
804+
</configuration>
805+
<list size="13">
787806
<item index="0" class="java.lang.String" itemvalue="Android Application.emulator-2.1" />
788807
<item index="1" class="java.lang.String" itemvalue="Android Application.emualtor-2.2" />
789808
<item index="2" class="java.lang.String" itemvalue="Android Application.emulator-2.3.3" />
@@ -796,6 +815,7 @@
796815
<item index="9" class="java.lang.String" itemvalue="Android Application.emulator-4.1" />
797816
<item index="10" class="java.lang.String" itemvalue="Android Application.emulator-4.2" />
798817
<item index="11" class="java.lang.String" itemvalue="Android Application.device" />
818+
<item index="12" class="java.lang.String" itemvalue="Android Application.emulator-4.3" />
799819
</list>
800820
<configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
801821
<Host>localhost</Host>
@@ -850,14 +870,14 @@
850870
</todo-panel>
851871
</component>
852872
<component name="ToolWindowManager">
853-
<frame x="0" y="22" width="1920" height="1058" extended-state="6" />
854-
<editor active="true" />
873+
<frame x="0" y="22" width="1920" height="1028" extended-state="0" />
874+
<editor active="false" />
855875
<layout>
856876
<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" />
857877
<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" />
858878
<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" />
859879
<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" />
860-
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.7985462" sideWeight="0.3296875" order="3" side_tool="false" content_ui="tabs" />
880+
<window_info id="Debug" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.56806004" sideWeight="0.3296875" order="3" side_tool="false" content_ui="tabs" />
861881
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.57009345" sideWeight="0.66979164" order="13" side_tool="true" content_ui="tabs" />
862882
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.26770833" sideWeight="0.49532712" order="2" side_tool="true" content_ui="tabs" />
863883
<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" />
@@ -867,7 +887,7 @@
867887
<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" />
868888
<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" />
869889
<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" />
870-
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26770833" sideWeight="0.20145379" order="0" side_tool="false" content_ui="combo" />
890+
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26770833" sideWeight="0.43194" order="0" side_tool="false" content_ui="combo" />
871891
<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" />
872892
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3296875" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
873893
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
@@ -946,27 +966,6 @@
946966
<option name="FILTER_TARGETS" value="false" />
947967
</component>
948968
<component name="editorHistoryManager">
949-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/AttachExistingDatabaseTest.java">
950-
<provider selected="true" editor-type-id="text-editor">
951-
<state line="35" column="9" selection-start="1499" selection-end="1499" vertical-scroll-proportion="0.0">
952-
<folding />
953-
</state>
954-
</provider>
955-
</entry>
956-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/ZeteticApplication.java">
957-
<provider selected="true" editor-type-id="text-editor">
958-
<state line="35" column="16" selection-start="984" selection-end="984" vertical-scroll-proportion="0.0">
959-
<folding />
960-
</state>
961-
</provider>
962-
</entry>
963-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/CursorAccessTest.java">
964-
<provider selected="true" editor-type-id="text-editor">
965-
<state line="34" column="93" selection-start="1165" selection-end="1296" vertical-scroll-proportion="0.0">
966-
<folding />
967-
</state>
968-
</provider>
969-
</entry>
970969
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/VerifyOnUpgradeIsCalledTest.java">
971970
<provider selected="true" editor-type-id="text-editor">
972971
<state line="8" column="0" selection-start="259" selection-end="259" vertical-scroll-proportion="0.097613886" />
@@ -1038,23 +1037,44 @@
10381037
</state>
10391038
</provider>
10401039
</entry>
1041-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/TestSuiteRunner.java">
1040+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/AttachNewDatabaseTest.java">
1041+
<provider selected="true" editor-type-id="text-editor">
1042+
<state line="28" column="0" selection-start="1115" selection-end="1115" vertical-scroll-proportion="0.0">
1043+
<folding />
1044+
</state>
1045+
</provider>
1046+
</entry>
1047+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/InterprocessBlobQueryTest.java">
10421048
<provider selected="true" editor-type-id="text-editor">
1043-
<state line="69" column="38" selection-start="2534" selection-end="2534" vertical-scroll-proportion="0.0">
1049+
<state line="9" column="13" selection-start="225" selection-end="225" vertical-scroll-proportion="0.0">
10441050
<folding />
10451051
</state>
10461052
</provider>
10471053
</entry>
1048-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/AttachNewDatabaseTest.java">
1054+
<entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
10491055
<provider selected="true" editor-type-id="text-editor">
1050-
<state line="28" column="0" selection-start="1115" selection-end="1115" vertical-scroll-proportion="0.0">
1056+
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
1057+
<folding />
1058+
</state>
1059+
</provider>
1060+
</entry>
1061+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/ZeteticContentProvider2.java">
1062+
<provider selected="true" editor-type-id="text-editor">
1063+
<state line="12" column="13" selection-start="289" selection-end="289" vertical-scroll-proportion="0.07700535">
1064+
<folding />
1065+
</state>
1066+
</provider>
1067+
</entry>
1068+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/TestSuiteRunner.java">
1069+
<provider selected="true" editor-type-id="text-editor">
1070+
<state line="46" column="51" selection-start="1395" selection-end="1395" vertical-scroll-proportion="0.0">
10511071
<folding />
10521072
</state>
10531073
</provider>
10541074
</entry>
10551075
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/PragmaCipherVersionTest.java">
10561076
<provider selected="true" editor-type-id="text-editor">
1057-
<state line="10" column="24" selection-start="267" selection-end="267" vertical-scroll-proportion="0.97590363">
1077+
<state line="15" column="34" selection-start="477" selection-end="477" vertical-scroll-proportion="0.672">
10581078
<folding />
10591079
</state>
10601080
</provider>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public boolean execute(SQLiteDatabase database) {
1414
if(cursor != null){
1515
cursor.moveToNext();
1616
String cipherVersion = cursor.getString(0);
17+
cursor.close();
1718
return cipherVersion.equals(CURRENT_CIPHER_VERSION);
1819
}
1920
return false;

0 commit comments

Comments
 (0)