Skip to content

Commit a3ff35e

Browse files
developernotesdevelopernotes
committed
SQLCipher libraries statically link OpenSSL
1 parent 14d0e3f commit a3ff35e

File tree

5 files changed

+39
-54
lines changed

5 files changed

+39
-54
lines changed

‎libs/armeabi/libsqlcipher_android.so‎

1.02 MB
Binary file not shown.

‎libs/sqlcipher.jar‎

0 Bytes
Binary file not shown.

‎libs/x86/libdatabase_sqlcipher.so‎

1.36 MB
Binary file not shown.

‎libs/x86/libsqlcipher_android.so‎

1.31 MB
Binary file not shown.

‎net.zetetic.sqlcipher.test.iws‎

Lines changed: 39 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<list default="true" id="cccb5bfe-eb2a-4282-b2df-29e914014eae" name="Default" comment="" />
1717
<ignored path="net.zetetic.sqlcipher.test.iws" />
1818
<ignored path=".idea/workspace.xml" />
19-
<file path="/fragment.java" changelist="cccb5bfe-eb2a-4282-b2df-29e914014eae" time="1372251708475" ignored="false" />
19+
<file path="/fragment.java" changelist="cccb5bfe-eb2a-4282-b2df-29e914014eae" time="1376582458643" ignored="false" />
2020
<file path="/QueryNonEncryptedDatabaseTest.java" changelist="cccb5bfe-eb2a-4282-b2df-29e914014eae" time="1360768313829" ignored="false" />
2121
<file path="/TestSuiteRunner.java" changelist="cccb5bfe-eb2a-4282-b2df-29e914014eae" time="1372337206697" ignored="false" />
2222
<file path="$PROJECT_DIR$/../strip-android/src/net/zetetic/strip/helpers/SQLCipherDatabaseConnection.java" changelist="cccb5bfe-eb2a-4282-b2df-29e914014eae" time="1364912317293" ignored="false" />
@@ -88,11 +88,8 @@
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="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>
91+
<state line="55" column="34" selection-start="1806" selection-end="1806" vertical-scroll-proportion="0.0">
92+
<folding />
9693
</state>
9794
</provider>
9895
</entry>
@@ -101,9 +98,7 @@
10198
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/GetTypeFromCrossProcessCursorWrapperTest.java">
10299
<provider selected="true" editor-type-id="text-editor">
103100
<state line="16" column="25" selection-start="679" selection-end="679" vertical-scroll-proportion="0.0">
104-
<folding>
105-
<element signature="imports" expanded="false" />
106-
</folding>
101+
<folding />
107102
</state>
108103
</provider>
109104
</entry>
@@ -138,7 +133,7 @@
138133
<file leaf-file-name="PragmaCipherVersionTest.java" pinned="false" current="true" current-in-tab="true">
139134
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/PragmaCipherVersionTest.java">
140135
<provider selected="true" editor-type-id="text-editor">
141-
<state line="16" column="52" selection-start="551" selection-end="551" vertical-scroll-proportion="0.6506024">
136+
<state line="19" column="5" selection-start="601" selection-end="601" vertical-scroll-proportion="0.73137695">
142137
<folding />
143138
</state>
144139
</provider>
@@ -147,7 +142,7 @@
147142
<file leaf-file-name="SQLCipherTest.java" pinned="false" current="false" current-in-tab="false">
148143
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/SQLCipherTest.java">
149144
<provider selected="true" editor-type-id="text-editor">
150-
<state line="33" column="22" selection-start="1022" selection-end="1022" vertical-scroll-proportion="0.0">
145+
<state line="28" column="9" selection-start="829" selection-end="829" vertical-scroll-proportion="0.0">
151146
<folding />
152147
</state>
153148
</provider>
@@ -230,10 +225,9 @@
230225
<option name="LAST_EDITED_TAB_NAME" />
231226
</component>
232227
<component name="ProjectFrameBounds">
233-
<option name="x" value="842" />
234228
<option name="y" value="22" />
235-
<option name="width" value="838" />
236-
<option name="height" value="1028" />
229+
<option name="width" value="1920" />
230+
<option name="height" value="1058" />
237231
</component>
238232
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
239233
<OptionsSetting value="true" id="Add" />
@@ -422,12 +416,12 @@
422416
<property name="DEBUGGABLE_PROCESS" value="net.zetetic" />
423417
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
424418
<property name="restartRequiresConfirmation" value="true" />
425-
<property name="MemberChooser.showClasses" value="true" />
426419
<property name="FullScreen" value="false" />
420+
<property name="MemberChooser.showClasses" value="true" />
427421
<property name="GoToClass.includeLibraries" value="false" />
428-
<property name="options.splitter.details.proportions" value="0.2" />
429-
<property name="dynamic.classpath" value="false" />
430422
<property name="options.searchVisible" value="true" />
423+
<property name="dynamic.classpath" value="false" />
424+
<property name="options.splitter.details.proportions" value="0.2" />
431425
</component>
432426
<component name="RecentsManager">
433427
<key name="CopyFile.RECENT_KEYS">
@@ -437,7 +431,25 @@
437431
<recent name="net.zetetic.tests" />
438432
</key>
439433
</component>
440-
<component name="RunManager" selected="Android Application.emulator-4.1">
434+
<component name="RunManager" selected="Android Application.emulator-4.2">
435+
<configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
436+
<module name="" />
437+
<option name="TESTING_TYPE" value="0" />
438+
<option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
439+
<option name="METHOD_NAME" value="" />
440+
<option name="CLASS_NAME" value="" />
441+
<option name="PACKAGE_NAME" value="" />
442+
<option name="TARGET_SELECTION_MODE" value="EMULATOR" />
443+
<option name="PREFERRED_AVD" value="" />
444+
<option name="USE_COMMAND_LINE" value="true" />
445+
<option name="COMMAND_LINE" value="" />
446+
<option name="WIPE_USER_DATA" value="false" />
447+
<option name="DISABLE_BOOT_ANIMATION" value="false" />
448+
<option name="NETWORK_SPEED" value="full" />
449+
<option name="NETWORK_LATENCY" value="none" />
450+
<option name="CLEAR_LOGCAT" value="false" />
451+
<method />
452+
</configuration>
441453
<configuration default="true" type="MavenRunConfiguration" factoryName="Maven">
442454
<MavenSettings>
443455
<option name="myGeneralSettings" />
@@ -460,24 +472,6 @@
460472
</MavenSettings>
461473
<method />
462474
</configuration>
463-
<configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
464-
<module name="" />
465-
<option name="TESTING_TYPE" value="0" />
466-
<option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
467-
<option name="METHOD_NAME" value="" />
468-
<option name="CLASS_NAME" value="" />
469-
<option name="PACKAGE_NAME" value="" />
470-
<option name="TARGET_SELECTION_MODE" value="EMULATOR" />
471-
<option name="PREFERRED_AVD" value="" />
472-
<option name="USE_COMMAND_LINE" value="true" />
473-
<option name="COMMAND_LINE" value="" />
474-
<option name="WIPE_USER_DATA" value="false" />
475-
<option name="DISABLE_BOOT_ANIMATION" value="false" />
476-
<option name="NETWORK_SPEED" value="full" />
477-
<option name="NETWORK_LATENCY" value="none" />
478-
<option name="CLEAR_LOGCAT" value="false" />
479-
<method />
480-
</configuration>
481475
<configuration default="true" type="Remote" factoryName="Remote">
482476
<option name="USE_SOCKET_TRANSPORT" value="true" />
483477
<option name="SERVER_MODE" value="false" />
@@ -849,14 +843,14 @@
849843
</todo-panel>
850844
</component>
851845
<component name="ToolWindowManager">
852-
<frame x="842" y="22" width="838" height="1028" extended-state="6" />
846+
<frame x="0" y="22" width="1920" height="1058" extended-state="0" />
853847
<editor active="true" />
854848
<layout>
855849
<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" />
856850
<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" />
857851
<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" />
858852
<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" />
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" />
853+
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.5109034" sideWeight="0.0" order="3" side_tool="false" content_ui="tabs" />
860854
<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" />
861855
<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" />
862856
<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" />
@@ -965,9 +959,7 @@
965959
</entry>
966960
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/TestSuiteActivity.java">
967961
<provider selected="true" editor-type-id="text-editor">
968-
<state line="14" column="13" selection-start="339" selection-end="339" vertical-scroll-proportion="0.0">
969-
<folding />
970-
</state>
962+
<state line="14" column="13" selection-start="339" selection-end="339" vertical-scroll-proportion="0.0" />
971963
</provider>
972964
</entry>
973965
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/ImportUnencryptedDatabaseTest.java">
@@ -977,9 +969,7 @@
977969
</entry>
978970
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/ZeteticApplication.java">
979971
<provider selected="true" editor-type-id="text-editor">
980-
<state line="16" column="82" selection-start="575" selection-end="575" vertical-scroll-proportion="0.01978022">
981-
<folding />
982-
</state>
972+
<state line="16" column="82" selection-start="575" selection-end="575" vertical-scroll-proportion="0.01978022" />
983973
</provider>
984974
</entry>
985975
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/ReadableWritableAccessTest.java">
@@ -1010,7 +1000,7 @@
10101000
</entry>
10111001
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/SQLCipherTest.java">
10121002
<provider selected="true" editor-type-id="text-editor">
1013-
<state line="33" column="22" selection-start="1022" selection-end="1022" vertical-scroll-proportion="0.0">
1003+
<state line="28" column="9" selection-start="829" selection-end="829" vertical-scroll-proportion="0.0">
10141004
<folding />
10151005
</state>
10161006
</provider>
@@ -1023,25 +1013,20 @@
10231013
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/GetTypeFromCrossProcessCursorWrapperTest.java">
10241014
<provider selected="true" editor-type-id="text-editor">
10251015
<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>
1016+
<folding />
10291017
</state>
10301018
</provider>
10311019
</entry>
10321020
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/TestSuiteRunner.java">
10331021
<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">
1035-
<folding>
1036-
<element signature="imports" expanded="false" />
1037-
<element signature="e#1112#1127#0" expanded="false" />
1038-
</folding>
1022+
<state line="55" column="34" selection-start="1806" selection-end="1806" vertical-scroll-proportion="0.0">
1023+
<folding />
10391024
</state>
10401025
</provider>
10411026
</entry>
10421027
<entry file="file://$PROJECT_DIR$/src/main/java/net/zetetic/tests/PragmaCipherVersionTest.java">
10431028
<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">
1029+
<state line="19" column="5" selection-start="601" selection-end="601" vertical-scroll-proportion="0.73137695">
10451030
<folding />
10461031
</state>
10471032
</provider>

0 commit comments

Comments
 (0)