Throw more specific exceptions from JNI

Author: developernotes

android-database-sqlcipher/src/main/cpp/net_sqlcipher_CursorWindow.cpp

@@ -98,14 +98,14 @@ namespace sqlcipher {
   {
     char buf[100];
     snprintf(buf, sizeof(buf), "get field slot from row %d col %d failed", row, column);
-    jniThrowException(env, "java/lang/IllegalStateException", buf);
+    jniThrowException(env, "net/sqlcipher/InvalidRowColumnException", buf);
   }
 
   static void throwUnknowTypeException(JNIEnv * env, jint type)
   {
     char buf[80];
     snprintf(buf, sizeof(buf), "UNKNOWN type %d", type);
-    jniThrowException(env, "java/lang/IllegalStateException", buf);
+    jniThrowException(env, "net/sqlcipher/UnknownTypeException", buf);
   }
 
   static jlong getLong_native(JNIEnv * env, jobject object, jint row, jint column)

android-database-sqlcipher/src/main/cpp/net_sqlcipher_database_SQLiteQuery.cpp

@@ -210,7 +210,8 @@ static jint native_fill_window(JNIEnv* env, jobject object, jobject javaWindow,
                     field_slot_t * fieldDir = window->allocRow();
                     if(!fieldDir) {
                       LOG_WINDOW("Failed to allocate row in reset, bailing\n");
-                      return startPos + numRows + finish_program_and_get_row_count(statement) + 1;
+                      jniThrowException(env, "net/sqlcipher/RowAllocationException",
+                          "Failed to allocate row in reset within native_fill_window");
                     } else {
                       LOG_WINDOW("Allocated row in reset set\n");
                     }

android-database-sqlcipher/src/main/java/net/sqlcipher/InvalidRowColumnException.java

@@ -0,0 +1,14 @@
+package net.sqlcipher;
+
+/**
+ * An exception that indicates there was an error accessing a specific row/column.
+ */
+public class InvalidRowColumnException extends RuntimeException
+{
+    public InvalidRowColumnException() {}
+
+    public InvalidRowColumnException(String error)
+    {
+        super(error);
+    }
+}

android-database-sqlcipher/src/main/java/net/sqlcipher/RowAllocationException.java

@@ -0,0 +1,15 @@
+package net.sqlcipher;
+
+/**
+ * An exception that indicates there was an error attempting to allocate a row
+ * for the CursorWindow.
+ */
+public class RowAllocationException extends RuntimeException
+{
+    public RowAllocationException() {}
+
+    public RowAllocationException(String error)
+    {
+        super(error);
+    }
+}

android-database-sqlcipher/src/main/java/net/sqlcipher/UnknownTypeException.java

@@ -0,0 +1,14 @@
+package net.sqlcipher;
+
+/**
+ * An exception that indicates an unknown type was returned.
+ */
+public class UnknownTypeException extends RuntimeException
+{
+    public UnknownTypeException() {}
+
+    public UnknownTypeException(String error)
+    {
+        super(error);
+    }
+}