Fixed issue where COM_QueryResponse would inadvertently detect a MySQL Error packet and then throw an error because it wasn't actually a MySQL Error Packet.

Author: Chris Board

.idea/compiler.xml

@@ -8,14 +8,16 @@ buildscript {
         }
     }
 }
-
+apply plugin: 'maven-publish'
 apply plugin: 'com.android.library'
 if (rootProject.ext.publishToMavenLocal)
 {
+    println("using maven local")
     apply plugin: 'maven-publish'
 }
 else
 {
+    println("Not using maven local")
     apply plugin: 'com.github.dcendents.android-maven'
 }
 
@@ -25,11 +27,11 @@ group 'com.BoardiesITSolutions'
 
 
 android {
-    compileSdkVersion 30
+    compileSdk 33
     defaultConfig {
         //applicationId "com.BoardiesITSolutions.AndroidMySQLConnector"
         minSdkVersion 19
-        targetSdkVersion 30
+        targetSdkVersion 33
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -43,16 +45,23 @@ android {
         abortOnError false
     }
 
-
+    println("Is publishToMavenLocal set? " + rootProject.ext.publishToMavenLocal)
     if (rootProject.ext.publishToMavenLocal) {
         android.libraryVariants
 
-        publishing {
-            publications {
-                maven(MavenPublication)
-                        {
-                            artifact getArtifactFullPath()
-                        }
+        project.afterEvaluate {
+            project.publishing {
+                publications {
+                    mavenJava(MavenPublication) {
+                        groupId 'com.BoardiesITSolutions'
+                        artifactId 'AndroidMySQLConnector'
+                        version '0.49'
+                        artifact("$buildDir/outputs/aar/AndroidMySQLConnector-release.aar")
+                    }
+                }
+                repositories {
+                    mavenLocal()
+                }
             }
         }
 
@@ -89,6 +98,6 @@ def getArtifactFullPath() {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation("com.google.guava:guava:28.2-android")
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation('com.google.guava:guava:32.1.3-jre')
 }

.idea/gradle.xml

@@ -5,5 +5,6 @@ public class InvalidSQLPacketException extends Exception
     public InvalidSQLPacketException(String message)
     {
         super(message);
+        this.printStackTrace();
     }
 }

.idea/misc.xml

@@ -1,5 +1,7 @@
 package com.BoardiesITSolutions.AndroidMySQLConnector;
 
+import android.util.Log;
+
 import com.BoardiesITSolutions.AndroidMySQLConnector.Exceptions.MySQLConnException;
 import com.BoardiesITSolutions.AndroidMySQLConnector.Exceptions.MySQLException;
 
@@ -30,6 +32,7 @@ public static MYSQL_PACKET_TYPE getMySQLPacketType(byte[] socketData) throws IOE
         }
 
         int packetType = socketData[4] & 0xff;
+        Log.d("Helpers", "Get MySQL Packet Type. Packet Type: " + packetType + " Before Modding: " + socketData[4]);
         if ((packetType & 0xff) == 0xff)
         {
             return MYSQL_PACKET_TYPE.MYSQL_ERROR_PACKET;

AndroidMySQLConnector/build.gradle

@@ -15,6 +15,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.Semaphore;
+import java.util.logging.Logger;
 
 import javax.net.ssl.SSLSocket;
 
@@ -118,34 +119,39 @@ private void getSocketData() throws IOException
                         //continue fetching data
                         if (!isDBConnected)
                         {
+                            Log.d("MySQLIO", "DB Is Not Connected. Breaking MySQLIO");
                             break;
                         }
                         else {
                             int packetType = tempFullData[tempFullData.length - 1];
+                            Log.d("MySQLIO", "Packet Type: " + String.valueOf(packetType) + " at position: " + String.valueOf(tempFullData.length - 1));
                             Log.d("MySQIO", "Less than 1024 Bytes Returned. Packet Type at end of array (end of array would have to be an OK: " + packetType);
                             if (packetType == 0x00 || packetType == 0xfe)
                             {
+                                Log.d("MySQLIO", "Breaking MySQLIO due to OK packet at end of array");
                                 break;
                             }
                             packetType = tempFullData[tempFullData.length-1 - 8];
                             Log.d("MySQIO", "Less than 1024 bytes returned. Packet type -8 from the end of the array would need to be an EOF packet");
                             if (packetType == 0xfe || packetType == 0xff)
                             {
+                                Log.d("MySQLIO", "Breaking MySQLIO due to OK packet at end of array -8 bytes");
                                 break;
                             }
                             //The 4th byte can also contain the OK or EOF so check this as well
                             if (tempFullData[4] == 0x00 || tempFullData[4] == 0xfe || tempFullData[4] == 0xff)
                             {
+                                Log.d("MySQLIO", "Breaking MySQLIO due to OK packet at byte 4");
                                 break;
                             }
-                                Log.d("MySQIO", "Packet Type at -8 was: " + packetType + " so continuing fetching data");
+                            Log.d("MySQIO", "Packet Type at -8 was: " + packetType + " so continuing fetching data");
 
-                                if (expectedPayloadLength == (tempFullData.length - 4))
-                                {
-                                    break;
-                                }
+                            if (expectedPayloadLength == (tempFullData.length - 4))
+                            {
+                                Log.d("MySQLIO", "Breaking MySQLIO due to expected payload length");
+                                break;
                             }
-                        //If we get here continue fetching data
+                        }
 
                     }
                 }

AndroidMySQLConnector/src/main/java/com/BoardiesITSolutions/AndroidMySQLConnector/Exceptions/InvalidSQLPacketException.java

@@ -110,35 +110,11 @@ private void processPacketData()
             {
                 break;
             }
-            this.mysqlConn.getMysqlIO().shiftCurrentBytePosition(4);
-
-            //Check we don't have an error packet
-            if (Helpers.getMySQLPacketTypeFromIntWithoutShift(packetType) == Helpers.MYSQL_PACKET_TYPE.MYSQL_ERROR_PACKET)
-            {
-                try {
-                    MySQLErrorPacket errorPacket = new MySQLErrorPacket(this.mysqlConn);
-                    throw new MySQLException(errorPacket.getErrorMsg(), errorPacket.getErrorCode(), errorPacket.getSqlState());
-                }
-                catch (Exception ex)
-                {
-                    Log.e("COM_QueryResponse", ex.toString());
-                }
-                break;
-            }
-
-
 
+            this.mysqlConn.getMysqlIO().shiftCurrentBytePosition(4);
 
             MySQLRow row = new MySQLRow();
 
-            /*if (Helpers.getMySQLPacketTypeFromIntWithoutShift(packetType) == Helpers.MYSQL_PACKET_TYPE.MYSQL_EOF_PACKET
-                || Helpers.getMySQLPacketTypeFromIntWithoutShift(packetType) == Helpers.MYSQL_PACKET_TYPE.MYSQL_OK_PACKET)
-            {
-                Log.d("COM_QueryResponse", "Got EOF or OK Packet. Breaking from loop");
-                //We've got an EOF packet so we're at the end or an OK packet so we've got everything we need
-                break;
-            }*/
-
             int currentColumn = 0;
             for (; currentColumn < numberOfFields; currentColumn++)
             {
@@ -212,8 +188,6 @@ private void processPacketData()
             }
             timesProcessed++;
         }while(true);
-
-
     }
 
     public List<ColumnDefinition> getColumnDefinitions()

AndroidMySQLConnector/src/main/java/com/BoardiesITSolutions/AndroidMySQLConnector/Helpers.java

@@ -45,7 +45,7 @@ private void processPacket() throws IOException, InvalidSQLPacketException, MySQ
         this.setPacketSequenceNumber((byte)this.mysqlConn.getMysqlIO().extractData(1));
 
 
-        if (Helpers.getMySQLPacketType(this.mysqlConn.getMysqlIO().getSocketByteArray()) != Helpers.MYSQL_PACKET_TYPE.MYSQL_ERROR_PACKET) {
+        if (Helpers.getMySQLPacketTypeFromIntWithoutShift(this.mysqlConn.getMysqlIO().readCurrentByteWithoutShift()) != Helpers.MYSQL_PACKET_TYPE.MYSQL_ERROR_PACKET) {
             throw new InvalidSQLPacketException("Error: Trying to process a MySQL Error Packet but we don't have the expected packet header for a MySQL Error Packet");
         }
 

AndroidMySQLConnector/src/main/java/com/BoardiesITSolutions/AndroidMySQLConnector/MySQLIO.java

@@ -218,6 +218,8 @@ public void run()
                                     }
                                 }
                                 catch (final InvalidSQLPacketException e) {
+                                    Log.e("Statement", "Invalid SQL Packet Exception in Statement");
+                                    e.printStackTrace();
                                     if (mysqlConn.getReturnCallbackToMainThread()) {
                                         mysqlConn.getActivity().runOnUiThread(new Runnable() {
                                             @Override
@@ -263,6 +265,7 @@ public void run()
                         }
                         catch (final MySQLConnException ex)
                         {
+                            ex.printStackTrace();
                             if (mysqlConn.getReturnCallbackToMainThread())
                             {
                                 mysqlConn.getActivity().runOnUiThread(new Runnable() {