From af2ea86a03fadb12c4a402a5460975fddf348569 Mon Sep 17 00:00:00 2001
From: Astatin3 <77305074+Astatin3@users.noreply.github.com>
Date: Wed, 3 Apr 2024 20:36:47 -0600
Subject: [PATCH] Finally solve qr code encoding

---
 .../ui/transfer/TransferFragment.java           |  4 ++--
 .../ui/transfer/generatorView.java              | 17 +++++++++--------
 .../ui/transfer/scannerView.java                |  6 +++---
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/TransferFragment.java b/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/TransferFragment.java
index 1e10e55..74f4c28 100644
--- a/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/TransferFragment.java
+++ b/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/TransferFragment.java
@@ -41,8 +41,8 @@ public class TransferFragment extends Fragment {
             public void onClick(View v) {
                 binding.selectLayout.setVisibility(View.GONE);
                 binding.generatorLayout.setVisibility(View.VISIBLE);
-                binding.generatorLayout.start(binding, "Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism");
-//                binding.generatorLayout.start(binding, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99");
+//                binding.generatorLayout.start(binding, "Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism Antidisestablishmentarianism");
+                binding.generatorLayout.start(binding, "0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99");
             }
         });
 
diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/generatorView.java b/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/generatorView.java
index 74a73a0..e2054c1 100644
--- a/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/generatorView.java
+++ b/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/generatorView.java
@@ -106,16 +106,17 @@ public class generatorView extends ConstraintLayout {
         qrIndexD = binding.qrIndexD;
 
         String compiledData = null;
-        try {
-            byte[] tempData = fileEditor.compress(inputData.getBytes("UTF-8"));
-            compiledData = new String(tempData, "UTF-8");
-            alert(""+tempData.length, fileEditor.binaryVisualize(tempData));
-            Log.i("Info", fileEditor.binaryVisualize(tempData));
+//        try {
+        byte[] tempData = fileEditor.compress(inputData.getBytes(StandardCharsets.ISO_8859_1));
+        compiledData = new String(tempData, StandardCharsets.ISO_8859_1);
+//            alert(""+tempData.length, fileEditor.binaryVisualize(tempData));
+//            Log.i("Info", fileEditor.binaryVisualize(tempData));
 
-        }catch (UnsupportedEncodingException e){
-            e.printStackTrace();
-        }
+//        }catch (UnsupportedEncodingException e){
+//            e.printStackTrace();
+//        }
 
+        alert(""+compiledData.length(), compiledData);
 
         if(compiledData == null || inputData.length() < compiledData.length()){
             sendData(inputData);
diff --git a/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/scannerView.java b/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/scannerView.java
index e743a01..7ee874f 100644
--- a/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/scannerView.java
+++ b/app/src/main/java/com/astatin3/scoutingapp2025/ui/transfer/scannerView.java
@@ -128,9 +128,9 @@ public class scannerView extends ConstraintLayout {
 
             try {
                 byte[] compiledBytes = compiledData.getBytes(StandardCharsets.ISO_8859_1);
-//                alert("completed", ""+fileEditor.decompress(compiledBytes));
-                alert(""+compiledBytes.length, fileEditor.binaryVisualize(compiledBytes));
-                Log.i("Info", fileEditor.binaryVisualize(compiledBytes));
+                alert("completed", new String(fileEditor.decompress(compiledBytes), StandardCharsets.ISO_8859_1));
+//                alert(""+compiledBytes.length, fileEditor.binaryVisualize(compiledBytes));
+//                Log.i("Info", fileEditor.binaryVisualize(compiledBytes));
             }catch (Exception e){
 //                alert("completed", compiledData);
                 e.printStackTrace();