Skip to content

Commit c02b52d

Browse files
developernotesdevelopernotes
committed
Updating build to use the 2.0.5 release of SQLCipher for Android
1 parent d9466fc commit c02b52d

File tree

3 files changed

+37
-51
lines changed

3 files changed

+37
-51
lines changed

‎libs/sqlcipher.jar‎

0 Bytes
Binary file not shown.

‎net.zetetic.sqlcipher.test.iml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/AndroidManifest.xml" />
99
<option name="RES_FOLDER_RELATIVE_PATH" value="/res" />
1010
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/assets" />
11-
<option name="LIBS_FOLDER_RELATIVE_PATH" value="/libs" />
11+
<option name="LIBS_FOLDER_RELATIVE_PATH" value="/src/main/native" />
1212
<option name="REGENERATE_R_JAVA" value="true" />
1313
<option name="REGENERATE_JAVA_BY_AIDL" value="true" />
1414
<option name="USE_CUSTOM_APK_RESOURCE_FOLDER" value="false" />
@@ -24,6 +24,7 @@
2424
<option name="RUN_PROGUARD" value="false" />
2525
<option name="PROGUARD_CFG_PATH" value="/proguard.cfg" />
2626
<resOverlayFolders />
27+
<includeSystemProguardFile>false</includeSystemProguardFile>
2728
</configuration>
2829
</facet>
2930
</component>
@@ -38,6 +39,7 @@
3839
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-assets" />
3940
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-resources" />
4041
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/extracted-dependencies" />
42+
<excludeFolder url="file://$MODULE_DIR$/target/output" />
4143
<excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
4244
</content>
4345
<orderEntry type="sourceFolder" forTests="false" />

‎net.zetetic.sqlcipher.test.iws‎

Lines changed: 34 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@
6565
<property name="field_breakpoints_groupByClasses" value="true" />
6666
<property name="method_breakpoints_groupByClasses" value="true" />
6767
<property name="exception_breakpoints_viewId" value="TABLE" />
68-
<property name="field_breakpoints_viewId" value="TABLE" />
6968
<property name="exception_breakpoints_groupByClasses" value="true" />
69+
<property name="field_breakpoints_viewId" value="TABLE" />
7070
<property name="method_breakpoints_groupByMethods" value="false" />
7171
</ui_properties>
7272
</component>
@@ -79,9 +79,7 @@
7979
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/ImportUnencryptedDatabaseTest.java">
8080
<provider selected="true" editor-type-id="text-editor">
8181
<state line="18" column="0" selection-start="550" selection-end="550" vertical-scroll-proportion="0.0">
82-
<folding>
83-
<element signature="imports" expanded="true" />
84-
</folding>
82+
<folding />
8583
</state>
8684
</provider>
8785
</entry>
@@ -107,7 +105,7 @@
107105
<file leaf-file-name="TestSuiteRunner.java" pinned="false" current="true" current-in-tab="true">
108106
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/TestSuiteRunner.java">
109107
<provider selected="true" editor-type-id="text-editor">
110-
<state line="42" column="5" selection-start="1136" selection-end="1136" vertical-scroll-proportion="0.5846154">
108+
<state line="35" column="54" selection-start="933" selection-end="933" vertical-scroll-proportion="0.4065934">
111109
<folding />
112110
</state>
113111
</provider>
@@ -210,16 +208,6 @@
210208
<sortByType />
211209
</navigator>
212210
<panes>
213-
<pane id="Scope">
214-
<subPane subId="Project Files">
215-
<PATH>
216-
<PATH_ELEMENT USER_OBJECT="Root">
217-
<option name="myItemId" value="" />
218-
<option name="myItemType" value="" />
219-
</PATH_ELEMENT>
220-
</PATH>
221-
</subPane>
222-
</pane>
223211
<pane id="PackagesPane">
224212
<subPane>
225213
<PATH>
@@ -388,6 +376,16 @@
388376
</PATH>
389377
</subPane>
390378
</pane>
379+
<pane id="Scope">
380+
<subPane subId="Project Files">
381+
<PATH>
382+
<PATH_ELEMENT USER_OBJECT="Root">
383+
<option name="myItemId" value="" />
384+
<option name="myItemType" value="" />
385+
</PATH_ELEMENT>
386+
</PATH>
387+
</subPane>
388+
</pane>
391389
<pane id="Favorites" />
392390
</panes>
393391
</component>
@@ -406,12 +404,12 @@
406404
<property name="MemberChooser.copyJavadoc" value="false" />
407405
<property name="DEBUGGABLE_PROCESS" value="net.zetetic" />
408406
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
409-
<property name="MemberChooser.showClasses" value="true" />
410407
<property name="FullScreen" value="false" />
408+
<property name="MemberChooser.showClasses" value="true" />
411409
<property name="GoToClass.includeLibraries" value="false" />
412-
<property name="options.splitter.details.proportions" value="0.2" />
413-
<property name="dynamic.classpath" value="false" />
414410
<property name="options.searchVisible" value="true" />
411+
<property name="dynamic.classpath" value="false" />
412+
<property name="options.splitter.details.proportions" value="0.2" />
415413
</component>
416414
<component name="RecentsManager">
417415
<key name="CopyFile.RECENT_KEYS">
@@ -421,7 +419,7 @@
421419
<recent name="net.zetetic.tests" />
422420
</key>
423421
</component>
424-
<component name="RunManager" selected="Android Application.emulator-2.1">
422+
<component name="RunManager" selected="Android Application.emulator-4.0.3">
425423
<configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
426424
<module name="" />
427425
<option name="TESTING_TYPE" value="0" />
@@ -759,22 +757,22 @@
759757
<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" />
760758
<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" />
761759
<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" />
762-
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32977587" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
763760
<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" />
764-
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33724654" sideWeight="0.41720086" order="3" side_tool="false" content_ui="tabs" />
761+
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.5090715" sideWeight="0.0" order="3" side_tool="false" content_ui="tabs" />
765762
<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" />
766763
<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" />
767764
<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" />
768-
<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="10" side_tool="false" content_ui="tabs" />
769765
<window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.6307364" sideWeight="0.91933763" order="8" side_tool="false" content_ui="tabs" />
770766
<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" />
771767
<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" />
772768
<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="4" side_tool="false" content_ui="tabs" />
773769
<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" />
774-
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24252136" sideWeight="0.36926362" order="0" side_tool="false" content_ui="combo" />
770+
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24252136" sideWeight="0.4909285" order="0" side_tool="false" content_ui="combo" />
775771
<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" />
776772
<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" />
777773
<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" />
774+
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32977587" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
775+
<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="10" side_tool="false" content_ui="tabs" />
778776
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
779777
<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" />
780778
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -885,53 +883,39 @@
885883
<state line="8" column="0" selection-start="228" selection-end="228" vertical-scroll-proportion="0.13846155" />
886884
</provider>
887885
</entry>
888-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/AttachExistingDatabaseTest.java">
889-
<provider selected="true" editor-type-id="text-editor">
890-
<state line="15" column="112" selection-start="456" selection-end="456" vertical-scroll-proportion="0.0">
891-
<folding />
892-
</state>
893-
</provider>
894-
</entry>
895886
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/MigrationFromDatabaseFormat1To2.java">
896887
<provider selected="true" editor-type-id="text-editor">
897-
<state line="25" column="31" selection-start="1097" selection-end="1097" vertical-scroll-proportion="0.6289517">
898-
<folding />
899-
</state>
888+
<state line="25" column="31" selection-start="1097" selection-end="1097" vertical-scroll-proportion="0.6289517" />
900889
</provider>
901890
</entry>
902-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/ZeteticApplication.java">
891+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/ImportUnencryptedDatabaseTest.java">
903892
<provider selected="true" editor-type-id="text-editor">
904-
<state line="58" column="5" selection-start="1844" selection-end="1844" vertical-scroll-proportion="0.0">
905-
<folding />
906-
</state>
893+
<state line="18" column="0" selection-start="550" selection-end="550" vertical-scroll-proportion="0.0" />
907894
</provider>
908895
</entry>
909896
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/SQLCipherTest.java">
910897
<provider selected="true" editor-type-id="text-editor">
911-
<state line="27" column="0" selection-start="768" selection-end="768" vertical-scroll-proportion="0.0">
912-
<folding />
913-
</state>
898+
<state line="27" column="0" selection-start="768" selection-end="768" vertical-scroll-proportion="0.0" />
914899
</provider>
915900
</entry>
916901
<entry file="file://$PROJECT_DIR$/AndroidManifest.xml">
917902
<provider selected="true" editor-type-id="text-editor">
918-
<state line="16" column="0" selection-start="814" selection-end="814" vertical-scroll-proportion="0.0">
919-
<folding />
920-
</state>
903+
<state line="16" column="0" selection-start="814" selection-end="814" vertical-scroll-proportion="0.0" />
921904
</provider>
922905
</entry>
923-
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/ImportUnencryptedDatabaseTest.java">
906+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/ZeteticApplication.java">
924907
<provider selected="true" editor-type-id="text-editor">
925-
<state line="18" column="0" selection-start="550" selection-end="550" vertical-scroll-proportion="0.0">
926-
<folding>
927-
<element signature="imports" expanded="true" />
928-
</folding>
929-
</state>
908+
<state line="58" column="5" selection-start="1844" selection-end="1844" vertical-scroll-proportion="0.0" />
909+
</provider>
910+
</entry>
911+
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/AttachExistingDatabaseTest.java">
912+
<provider selected="true" editor-type-id="text-editor">
913+
<state line="15" column="112" selection-start="456" selection-end="456" vertical-scroll-proportion="0.0" />
930914
</provider>
931915
</entry>
932916
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/TestSuiteRunner.java">
933917
<provider selected="true" editor-type-id="text-editor">
934-
<state line="42" column="5" selection-start="1136" selection-end="1136" vertical-scroll-proportion="0.5846154">
918+
<state line="35" column="54" selection-start="933" selection-end="933" vertical-scroll-proportion="0.4065934">
935919
<folding />
936920
</state>
937921
</provider>

0 commit comments

Comments
 (0)