updated source to handle SDK version library loading

n8fr8 · n8fr8 · commit 2416926c1b9a · 2011-05-05T20:24:40.000-04:00
diff --git a/default.properties b/default.properties
@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=android-8
+target=android-6
diff --git a/jni/Android.mk b/jni/Android.mk
@@ -1,4 +1,4 @@
-LOCAL_PATH:= $(call my-dir)
+uOCAL_PATH:= $(call my-dir)
 
 EXTERNAL_PATH := ../external
 
@@ -50,7 +50,8 @@ LOCAL_SHARED_LIBRARIES := \
 	libsqlite3_android
 
 LOCAL_CFLAGS += -U__APPLE__
-LOCAL_LDFLAGS += -L../obj/local/armeabi/ -L/home/n8fr8/android/mydroid/out/target/product/generic/obj/SHARED_LIBRARIES/libutils_intermediates/LINKED/ -L/home/n8fr8/android/mydroid/out/target/product/generic/obj/SHARED_LIBRARIES/libbinder_intermediates/LINKED/
+LOCAL_LDFLAGS += -L../external/android-2.2/ -L../external/libs/armeabi/
+LOCAL_LDFLAGS += -L/home/n8fr8/android/mydroid/out/target/product/generic/obj/SHARED_LIBRARIES/libutils_intermediates/LINKED/ -L/home/n8fr8/android/mydroid/out/target/product/generic/obj/SHARED_LIBRARIES/libbinder_intermediates/LINKED/ -L/home/n8fr8/android/mydroid/out/target/product/generic/obj/SHARED_LIBRARIES/libandroid_runtime_intermediates/LINKED/
 
 # libs from the NDK
 LOCAL_LDLIBS += -ldl -llog
diff --git a/src/example/SQLDemoActivity.java b/src/example/SQLDemoActivity.java
@@ -10,44 +10,24 @@
 public class SQLDemoActivity extends Activity {
   EventDataSQLHelper eventsData;
 
-  /*
- 0x00000001 (NEEDED)                     Shared library: [libstlport_shared.so]
- 0x00000001 (NEEDED)                     Shared library: [libc.so]
- 0x00000001 (NEEDED)                     Shared library: [libstdc++.so]
- 0x00000001 (NEEDED)                     Shared library: [libm.so]
- 0x00000001 (NEEDED)                     Shared library: [libsqlcipher.so]
- 0x00000001 (NEEDED)                     Shared library: [liblog.so]
- 0x00000001 (NEEDED)                     Shared library: [libdl.s	  
-   */
 
   
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
+    
+    //you must set Context on SQLiteDatabase first
+    SQLiteDatabase.loadLibs(this);
 
- //   System.loadLibrary("nativehelper");
- //   System.loadLibrary("android_runtime");
-
-  //  System.loadLibrary("crypto");
-  //  System.loadLibrary("ssl");
-
-    /*
-    System.loadLibrary("icudata");
-    System.loadLibrary("icui18n");
-    System.loadLibrary("icuuc"); 
-    */
- 
-   
-    /*
-    System.loadLibrary("lib/libstlport_shared.so");
-    System.loadLibrary("lib/libsqlcipher.so");
-    System.loadLibrary("lib/libdatabase_sqlcipher.so");
-    System.loadLibrary("lib/libsqlcipher_android.so");
-*/
+    String password = "foo123";
 
+    //then you can open the database using a password
+    SQLiteDatabase db = eventsData.getWritableDatabase(password);
+    db.close();
+    
     eventsData = new EventDataSQLHelper(this);
-    addEvent("Hello Android Event");
-    Cursor cursor = getEvents();
+    addEvent("Hello Android Event", password);
+    Cursor cursor = getEvents(password);
     showEvents(cursor);
   }
   
@@ -56,9 +36,8 @@ public void onDestroy() {
     eventsData.close();
   }
 
-  private void addEvent(String title) {
-    SQLiteDatabase db = eventsData.getWritableDatabase();
-    
+  private void addEvent(String title, String password) {
+    SQLiteDatabase db = eventsData.getWritableDatabase(password);
     
     ContentValues values = new ContentValues();
     values.put(EventDataSQLHelper.TIME, System.currentTimeMillis());
@@ -67,8 +46,11 @@ private void addEvent(String title) {
 
   }
 
-  private Cursor getEvents() {
-    SQLiteDatabase db = eventsData.getReadableDatabase();
+  private Cursor getEvents(String password) {
+    SQLiteDatabase db = eventsData.getReadableDatabase(password);
+    
+
+    
     Cursor cursor = db.query(EventDataSQLHelper.TABLE, null, null, null, null,
         null, null);
     
diff --git a/src/info/guardianproject/database/sqlcipher/SQLiteDatabase.java b/src/info/guardianproject/database/sqlcipher/SQLiteDatabase.java
@@ -16,12 +16,16 @@
 
 package info.guardianproject.database.sqlcipher;
 
-import android.database.Cursor;
 import info.guardianproject.database.DatabaseUtils;
 import info.guardianproject.database.SQLException;
 import info.guardianproject.database.sqlcipher.SQLiteDebug.DbStats;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.lang.ref.WeakReference;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -36,17 +40,19 @@
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.regex.Pattern;
 
-import com.google.common.collect.Maps;
-
 import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
 import android.os.Debug;
+import android.os.Environment;
 import android.os.SystemClock;
 import android.text.TextUtils;
 import android.util.Config;
-import android.util.EventLog;
 import android.util.Log;
 import android.util.Pair;
 
+import com.google.common.collect.Maps;
+
 /**
  * Exposes methods to manage a SQLite database.
  * <p>SQLiteDatabase has methods to create, delete, execute SQL commands, and
@@ -67,12 +73,52 @@ public class SQLiteDatabase extends SQLiteClosable {
     private static final int EVENT_DB_OPERATION = 52000;
     private static final int EVENT_DB_CORRUPT = 75004;
 
-    static
+    public static void loadLibs (Context context)
     {
-  	  System.loadLibrary("stlport_shared");
-  	    System.loadLibrary("sqlcipher");
-  	    System.loadLibrary("sqlcipher_android");
-  	    System.loadLibrary("database_sqlcipher");
+    	
+  	  	System.loadLibrary("stlport_shared");
+  	  
+	    System.loadLibrary("sqlcipher");
+	
+	    String soFileName = "libsqlcipher_android";
+	    
+	    File baseFile = context.getFilesDir();
+	    
+	    File soFile = new File(baseFile,soFileName + ".so");
+	    
+	    boolean soLoaded = soFile.exists();
+	    
+	    if (!soLoaded)
+	    {
+	    	File libFile = new File(baseFile.getParent(),"lib");
+	    	File soSrcFile = new File(libFile,soFileName + "-" +  android.os.Build.VERSION.SDK_INT + ".so");
+	    
+	    	try
+	    	{
+		    	 InputStream in = new FileInputStream(soSrcFile);
+		    	 
+		    	 soFile.getParentFile().mkdirs();
+		        OutputStream out = new FileOutputStream(soFile);
+	
+		        // Transfer bytes from in to out
+		        byte[] buf = new byte[1024];
+		        int len;
+		        while ((len = in.read(buf)) > 0) {
+		            out.write(buf, 0, len);
+		        }
+		        in.close();
+		        out.close();
+	    	}
+	    	catch (IOException ioe)
+	    	{
+	    		
+	    	}
+	    	
+	    }
+	    	    
+	    System.load(soFile.getAbsolutePath());
+	    
+		System.loadLibrary("database_sqlcipher");
     }
     
     /**
@@ -355,7 +401,7 @@ public void setLockingEnabled(boolean lockingEnabled) {
 
     /* package */ void onCorruption() {
         Log.e(TAG, "Removing corrupt database: " + mPath);
-        EventLog.writeEvent(EVENT_DB_CORRUPT, mPath);
+    //    EventLog.writeEvent(EVENT_DB_CORRUPT, mPath);
         try {
             // Close the database (if we can), which will cause subsequent operations to fail.
             close();
@@ -817,11 +863,11 @@ public Cursor newCursor(SQLiteDatabase db,
      * @return the newly opened database
      * @throws SQLiteException if the database cannot be opened
      */
-    public static SQLiteDatabase openDatabase(String path, CursorFactory factory, int flags) {
+    public static SQLiteDatabase openDatabase(String path, String password, CursorFactory factory, int flags) {
         SQLiteDatabase sqliteDatabase = null;
         try {
             // Open the database.
-            sqliteDatabase = new SQLiteDatabase(path, factory, flags);
+            sqliteDatabase = new SQLiteDatabase(path, password, factory, flags);
             if (SQLiteDebug.DEBUG_SQL_STATEMENTS) {
                 sqliteDatabase.enableSqlTracing(path);
             }
@@ -837,7 +883,7 @@ public static SQLiteDatabase openDatabase(String path, CursorFactory factory, in
                 // delete is only for non-memory database files
                 new File(path).delete();
             }
-            sqliteDatabase = new SQLiteDatabase(path, factory, flags);
+            sqliteDatabase = new SQLiteDatabase(path, password, factory, flags);
         }
         ActiveDatabases.getInstance().mActiveDatabases.add(
                 new WeakReference<SQLiteDatabase>(sqliteDatabase));
@@ -847,15 +893,15 @@ public static SQLiteDatabase openDatabase(String path, CursorFactory factory, in
     /**
      * Equivalent to openDatabase(file.getPath(), factory, CREATE_IF_NECESSARY).
      */
-    public static SQLiteDatabase openOrCreateDatabase(File file, CursorFactory factory) {
-        return openOrCreateDatabase(file.getPath(), factory);
+    public static SQLiteDatabase openOrCreateDatabase(File file, String password, CursorFactory factory) {
+        return openOrCreateDatabase(file.getPath(), password, factory);
     }
 
     /**
      * Equivalent to openDatabase(path, factory, CREATE_IF_NECESSARY).
      */
-    public static SQLiteDatabase openOrCreateDatabase(String path, CursorFactory factory) {
-        return openDatabase(path, factory, CREATE_IF_NECESSARY);
+    public static SQLiteDatabase openOrCreateDatabase(String path, String password, CursorFactory factory) {
+        return openDatabase(path, password, factory, CREATE_IF_NECESSARY);
     }
 
     /**
@@ -869,9 +915,9 @@ public static SQLiteDatabase openOrCreateDatabase(String path, CursorFactory fac
      *            cursor when query is called
      * @return a SQLiteDatabase object, or null if the database can't be created
      */
-    public static SQLiteDatabase create(CursorFactory factory) {
+    public static SQLiteDatabase create(CursorFactory factory, String password) {
         // This is a magic string with special meaning for SQLite.
-        return openDatabase(":memory:", factory, CREATE_IF_NECESSARY);
+        return openDatabase(":memory:", password, factory, CREATE_IF_NECESSARY);
     }
 
     /**
@@ -1816,7 +1862,9 @@ protected void finalize() {
      * @param flags 0 or {@link #NO_LOCALIZED_COLLATORS}.  If the database file already
      *              exists, mFlags will be updated appropriately.
      */
-    public SQLiteDatabase(String path, CursorFactory factory, int flags) {
+    public SQLiteDatabase(String path, String password, CursorFactory factory, int flags) {
+    	
+    	
         if (path == null) {
             throw new IllegalArgumentException("path should not be null");
         }
@@ -1827,6 +1875,8 @@ public SQLiteDatabase(String path, CursorFactory factory, int flags) {
         mFactory = factory;
         dbopen(mPath, mFlags);
         
+        execSQL("PRAGMA key = '" + password + "'");
+        
         if (SQLiteDebug.DEBUG_SQL_CACHE) {
             mTimeOpened = getTime();
         }
@@ -1926,13 +1976,14 @@ public final String getPath() {
         String blockingPackage = "unknown";//ActivityThread.currentPackageName();
         if (blockingPackage == null) blockingPackage = "";
 
+        /*
         EventLog.writeEvent(
             EVENT_DB_OPERATION,
             getPathForLogs(),
             sql,
             durationMillis,
             blockingPackage,
-            samplePercent);
+            samplePercent);*/
     }
 
     /**
diff --git a/src/info/guardianproject/database/sqlcipher/SQLiteOpenHelper.java b/src/info/guardianproject/database/sqlcipher/SQLiteOpenHelper.java
@@ -74,7 +74,7 @@ public SQLiteOpenHelper(Context context, String name, CursorFactory factory, int
      * @throws SQLiteException if the database cannot be opened for writing
      * @return a read/write database object valid until {@link #close} is called
      */
-    public synchronized SQLiteDatabase getWritableDatabase() {
+    public synchronized SQLiteDatabase getWritableDatabase(String password) {
         if (mDatabase != null && mDatabase.isOpen() && !mDatabase.isReadOnly()) {
             return mDatabase;  // The database is already open for business
         }
@@ -95,7 +95,7 @@ public synchronized SQLiteDatabase getWritableDatabase() {
         try {
             mIsInitializing = true;
             if (mName == null) {
-                db = SQLiteDatabase.create(null);
+                db = SQLiteDatabase.create(null, password);
                 
             } else {
                 String path = mContext.getDatabasePath(mName).getPath();
@@ -104,7 +104,7 @@ public synchronized SQLiteDatabase getWritableDatabase() {
                 if (!dbPathFile.exists())
                 	dbPathFile.getParentFile().mkdirs();
                 
-                db = SQLiteDatabase.openOrCreateDatabase(path, mFactory);
+                db = SQLiteDatabase.openOrCreateDatabase(path, password, mFactory);
                 
              //   db = SQLiteDatabase.openDatabase(path,mFactory , SQLiteDatabase.OPEN_READWRITE);
 
@@ -160,7 +160,7 @@ public synchronized SQLiteDatabase getWritableDatabase() {
      * @return a database object valid until {@link #getWritableDatabase}
      *     or {@link #close} is called.
      */
-    public synchronized SQLiteDatabase getReadableDatabase() {
+    public synchronized SQLiteDatabase getReadableDatabase(String password) {
         if (mDatabase != null && mDatabase.isOpen()) {
             return mDatabase;  // The database is already open for business
         }
@@ -170,7 +170,7 @@ public synchronized SQLiteDatabase getReadableDatabase() {
         }
 
         try {
-            return getWritableDatabase();
+            return getWritableDatabase(password);
         } catch (SQLiteException e) {
             if (mName == null) throw e;  // Can't open a temp database read-only!
             Log.e(TAG, "Couldn't open " + mName + " for writing (will try read-only):", e);
@@ -180,7 +180,7 @@ public synchronized SQLiteDatabase getReadableDatabase() {
         try {
             mIsInitializing = true;
             String path = mContext.getDatabasePath(mName).getPath();
-            db = SQLiteDatabase.openDatabase(path, mFactory, SQLiteDatabase.OPEN_READONLY);
+            db = SQLiteDatabase.openDatabase(path, password, mFactory, SQLiteDatabase.OPEN_READONLY);
             if (db.getVersion() != mNewVersion) {
                 throw new SQLiteException("Can't upgrade read-only database from version " +
                         db.getVersion() + " to " + mNewVersion + ": " + path);
