Fixes for App Theme and MySql 8.0.21

- Fixes an unnecessary Android:Theme parameter in the manifest which requires a tools:replace to override it - Fixes UnsupportedServerException error on MySQL 8.0.21
BoardiesITSolutions · Aug 4, 2020 · be14e8a · be14e8a
1 parent e2cae46
commit be14e8a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/AndroidMySQLConnector/build.gradle b/AndroidMySQLConnector/build.gradle
@@ -20,7 +20,7 @@ else
 }
 
 archivesBaseName="AndroidMySQLConnector"
-version '0.40'
+version '0.41'
 group 'com.BoardiesITSolutions'
 
 
@@ -30,8 +30,8 @@ android {
         //applicationId "com.BoardiesITSolutions.AndroidMySQLConnector"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 28
-        versionName "0.40"
+        versionCode 29
+        versionName "0.41"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/AndroidMySQLConnector/src/main/AndroidManifest.xml b/AndroidMySQLConnector/src/main/AndroidManifest.xml
@@ -6,6 +6,5 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme" />
+        android:supportsRtl="true" />
 </manifest>
diff --git a/...ySQLConnector/src/main/java/com/BoardiesITSolutions/AndroidMySQLConnector/Connection.java b/...ySQLConnector/src/main/java/com/BoardiesITSolutions/AndroidMySQLConnector/Connection.java
@@ -93,6 +93,7 @@ public class Connection
     private final int UTF8_GENERAL_CI = 0x21;
     private final int UTF8_UNICODE_CI =0xc0;
     private final int UTF8MB4_UNICODE_CI = 0xe0;
+    private final int UTF8MB4 = 0xff;
     private final int BINARY = 0x3f;
 
     private AppCompatActivity activity;
@@ -492,6 +493,7 @@ private void setCharset() throws UnsupportedMySQLServerException {
             case UTF8_GENERAL_CI:
             case UTF8_UNICODE_CI:
             case UTF8MB4_UNICODE_CI:
+            case UTF8MB4:
                 charset = Charset.forName("UTF-8");
                 break;
                 default:

diff --git a/demoapplication/build.gradle b/demoapplication/build.gradle
@@ -30,6 +30,6 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'com.github.BoardiesITSolutions:Android-MySQL-Connector:0.40_MySQL8'
+    implementation 'com.github.BoardiesITSolutions:Android-MySQL-Connector:0.41_MySQL8'
 
 }