Adjustments based on lint results

Author: developernotes

src/net/sqlcipher/AbstractCursor.java

@@ -369,7 +369,7 @@ public boolean update(int columnIndex, Object obj) {
 
         // Long.valueOf() returns null sometimes!
 //        Long rowid = Long.valueOf(getLong(mRowIdColumnIndex));
-        Long rowid = new Long(getLong(mRowIdColumnIndex));
+        Long rowid = Long.valueOf(getLong(mRowIdColumnIndex));
         if (rowid == null) {
             throw new IllegalStateException("null rowid. mRowIdColumnIndex = " + mRowIdColumnIndex);
         }

src/net/sqlcipher/BulkCursorNative.java

@@ -166,7 +166,7 @@ public boolean onTransact(int code, Parcel data, Parcel reply, int flags)
 
                 case RESPOND_TRANSACTION: {
                     data.enforceInterface(IBulkCursor.descriptor);
-                    Bundle extras = data.readBundle();
+                    Bundle extras = data.readBundle(getClass().getClassLoader());
                     Bundle returnExtras = respond(extras);
                     reply.writeNoException();
                     reply.writeBundle(returnExtras);
@@ -334,7 +334,7 @@ public int requery(IContentObserver observer, CursorWindow window) throws Remote
             count = -1;
         } else {
             count = reply.readInt();
-            mExtras = reply.readBundle();
+            mExtras = reply.readBundle(getClass().getClassLoader());
         }
 
         data.recycle();
@@ -412,7 +412,7 @@ public Bundle getExtras() throws RemoteException {
 
             DatabaseUtils.readExceptionFromParcel(reply);
 
-            mExtras = reply.readBundle();
+            mExtras = reply.readBundle(getClass().getClassLoader());
             data.recycle();
             reply.recycle();
         }
@@ -431,7 +431,7 @@ public Bundle respond(Bundle extras) throws RemoteException {
 
         DatabaseUtils.readExceptionFromParcel(reply);
 
-        Bundle returnExtras = reply.readBundle();
+        Bundle returnExtras = reply.readBundle(getClass().getClassLoader());
         data.recycle();
         reply.recycle();
         return returnExtras;

src/net/sqlcipher/DefaultDatabaseErrorHandler.java

@@ -34,7 +34,7 @@
  */
 public final class DefaultDatabaseErrorHandler implements DatabaseErrorHandler {
 
-    private static final String TAG = "DefaultDatabaseErrorHandler";
+    private final String TAG = getClass().getSimpleName();
 
     /**
      * defines the default method to be invoked when database corruption is detected.

src/net/sqlcipher/database/SQLiteCursor.java

@@ -20,6 +20,7 @@
 import net.sqlcipher.CursorWindow;
 import net.sqlcipher.SQLException;
 
+import java.lang.ref.WeakReference;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -165,11 +166,19 @@ public void run() {
     /**
      * @hide
      */   
-    protected class MainThreadNotificationHandler extends Handler {
+    protected static class MainThreadNotificationHandler extends Handler {
+
+        private final WeakReference<SQLiteCursor> wrappedCursor;
+
+        MainThreadNotificationHandler(SQLiteCursor cursor) {
+          wrappedCursor = new WeakReference<SQLiteCursor>(cursor);
+        }
+
         public void handleMessage(Message msg) {
-            
-        	notifyDataSetChange();
-            
+            SQLiteCursor cursor = wrappedCursor.get();
+            if(cursor != null){
+              cursor.notifyDataSetChange();
+            }
         }
     }
 
@@ -184,7 +193,7 @@ public void registerDataSetObserver(DataSetObserver observer) {
                 mNotificationHandler == null) {
             queryThreadLock();
             try {
-                mNotificationHandler = new MainThreadNotificationHandler();
+                mNotificationHandler = new MainThreadNotificationHandler(this);
                 if (mPendingData) {
                 	notifyDataSetChange();
                     mPendingData = false;

src/net/sqlcipher/database/SQLiteDatabase.java

@@ -2496,7 +2496,7 @@ private void keyDatabase(SQLiteDatabaseHook databaseHook, Runnable keyOperation)
   }
 
     private String getTime() {
-        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS ").format(System.currentTimeMillis());
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS ", Locale.US).format(System.currentTimeMillis());
     }
 
     /**

src/net/sqlcipher/database/SQLiteQuery.java

@@ -206,12 +206,12 @@ public void bindArguments(Object[] args){
                     bindDouble(i + 1, (Double)value);
                 } else if (value instanceof Float) {
                     float number = ((Number)value).floatValue();
-                    bindDouble(i + 1, new Double(number));
+                    bindDouble(i + 1, Double.valueOf(number));
                 } else if (value instanceof Long) {
                     bindLong(i + 1, (Long)value);
                 } else if(value instanceof Integer) {
                     int number = ((Number) value).intValue();
-                    bindLong(i + 1, new Long(number));
+                    bindLong(i + 1, Long.valueOf(number));
                 } else if (value instanceof Boolean) {
                     bindLong(i + 1, (Boolean)value ? 1 : 0);
                 } else if (value instanceof byte[]) {