[1.5.0] Fix app for older devices where Charset.forName is required f…

…or utf-8
TrashGuyAnimations · Dec 10, 2024 · 13a6433 · 13a6433
1 parent f816c33
commit 13a6433
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -41,8 +41,8 @@ android {
         applicationId "com.wirtos.tguydroid"
         targetSdkVersion 35
         minSdkVersion 16
-        versionCode 6
-        versionName '1.4.1'
+        versionCode 7
+        versionName '1.5.0'
         archivesBaseName = "$applicationId-$versionName"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/app/src/main/java/com/wirtos/tguydroid/TGuy.java b/app/src/main/java/com/wirtos/tguydroid/TGuy.java
@@ -6,6 +6,7 @@
 import androidx.annotation.Nullable;
 
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 
 public class TGuy {
@@ -32,14 +33,10 @@ public class TGuy {
     TGuy(String str, int spacing) {
         byte[] res;
 
-        try {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                res = str.getBytes(StandardCharsets.UTF_8);
-            } else {
-                res = str.getBytes("UTF-8");
-            }
-        } catch (UnsupportedEncodingException e) {
-            res = new byte[]{0x41, 0x41, 0x41, 0x41};
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            res = str.getBytes(StandardCharsets.UTF_8);
+        } else {
+            res = str.getBytes(Charset.forName("UTF-8"));
         }
         tgobj = tguy_jni_ctor(res, spacing);
         if (tgobj == 0) {
@@ -59,14 +56,10 @@ public String toString() {
         if (res == null) {
             return "";
         }
-        try {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-                return new String(res, StandardCharsets.UTF_8);
-            } else {
-                return new String(res, "UTF-8");
-            }
-        } catch (UnsupportedEncodingException e) {
-            return "Unsupported";
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            return new String(res, StandardCharsets.UTF_8);
+        } else {
+            return new String(res, Charset.forName("UTF-8"));
         }
     }