Upgrading libraries to include support for ICS

Author: developernotes

assets/icudt44l.zip

@@ -19,6 +19,7 @@
         <option name="LIBRARY_PROJECT" value="false" />
         <option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="false" />
         <option name="GENERATE_UNSIGNED_APK" value="false" />
+        <option name="CUSTOM_DEBUG_KEYSTORE_PATH" value="" />
       </configuration>
     </facet>
   </component>
@@ -27,16 +28,19 @@
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/combined-assets" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/r" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target/android-classes" />
       <excludeFolder url="file://$MODULE_DIR$/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-resources" />
       <excludeFolder url="file://$MODULE_DIR$/target/generated-sources/extracted-dependencies" />
       <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
+      <excludeFolder url="file://$MODULE_DIR$/target/surefire" />
       <excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
     </content>
-    <orderEntry type="jdk" jdkName="Android 2.1-update1 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.android:android:2.1.2" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
@@ -49,6 +53,7 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20080701" level="project" />
     <orderEntry type="library" name="Maven: sqlcipher:sqlcipher:1.0" level="project" />
     <orderEntry type="library" name="Maven: guava:guava:1.0" level="project" />
+    <orderEntry type="jdk" jdkName="Android 2.1 Platform" jdkType="Android SDK" />
   </component>
 </module>
 

assets/icudt46l.zip

@@ -30,14 +30,8 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
-  <component name="FacetAutodetectingManager">
-    <autodetection-disabled>
-      <facet-type id="android">
-        <modules>
-          <module name="net.zetetic.sqlcipher.test" />
-        </modules>
-      </facet-type>
-    </autodetection-disabled>
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="android" url="file://$PROJECT_DIR$" />
   </component>
   <component name="JavacSettings">
     <option name="ADDITIONAL_OPTIONS_STRING" value="-target 1.6" />

libs/armeabi/libdatabase_sqlcipher.so

@@ -15,8 +15,7 @@ public class ZeteticContentProvider extends ContentProvider {
     private SQLiteDatabase database;
 
     public ZeteticContentProvider() {
-        SQLiteDatabase.loadLibs(ZeteticApplication.getInstance());
-        database = ZeteticApplication.getInstance().createDatabase();
+
     }
 
     @Override
@@ -26,6 +25,10 @@ public boolean onCreate() {
 
     @Override
     public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
+
+        SQLiteDatabase.loadLibs(ZeteticApplication.getInstance());
+        database = ZeteticApplication.getInstance().createDatabase();
+
         createDatabaseWithData(database);
         SQLiteQueryBuilder builder = new SQLiteQueryBuilder();
         builder.setTables("t1");

libs/armeabi/libsqlcipher_android.so

@@ -12,6 +12,8 @@ public boolean execute(SQLiteDatabase encryptedDatabase) {
         encryptedDatabase.execSQL("create table t1(a,b)");
         encryptedDatabase.execSQL("insert into t1(a,b) values(?, ?)", new Object[]{"one", "two"});
 
+        
+
         String newKey = "foo";
         File newDatabasePath = ZeteticApplication.getInstance().getDatabasePath("normal.db");
         String attachCommand = "ATTACH DATABASE ? as encrypted KEY ?";
@@ -22,7 +24,7 @@ public boolean execute(SQLiteDatabase encryptedDatabase) {
         encryptedDatabase.execSQL(createCommand);
         encryptedDatabase.execSQL(insertCommand);
         encryptedDatabase.execSQL(detachCommand);
-        
+
         return true;
     }
 
@@ -32,6 +34,11 @@ protected void tearDown() {
         newDatabasePath.delete();
     }
 
+    public android.database.sqlite.SQLiteDatabase createNormalDatabase(){
+        File newDatabasePath = ZeteticApplication.getInstance().getDatabasePath("normal.db");
+        return android.database.sqlite.SQLiteDatabase.openOrCreateDatabase(newDatabasePath.getAbsolutePath(), null);
+    }
+
     @Override
     public String getName() {
         return "Attach Database Test";