Fixed export .mct dump & theme issues.

ikarus23 · Dec 29, 2023 · 1fa0957 · 1fa0957
1 parent addf57c
commit 1fa0957
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 55 deletions.
diff --git a/...Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/ImportExportTool.java b/...Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/ImportExportTool.java
@@ -46,7 +46,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.GregorianCalendar;
-import java.util.Iterator;
 import java.util.Locale;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
@@ -649,11 +648,14 @@ private String[] convertDump(String[] source, FileType srcType,
                 break;
             case MCT:
                 ArrayList<String> export = new ArrayList<>();
-                Iterator<String> iter = blocks.keys();
                 int lastKnownSector = -1;
-                while (iter.hasNext()) {
-                    String blockKey = iter.next();
-                    int blockNr = Integer.parseInt(blockKey);
+                // Go through all possible blocks in a sorted order.
+                for (int blockNr = 0; blockNr < 256; blockNr++) {
+                    String blockKey = Integer.toString(blockNr);
+                    if (!blocks.has(blockKey)) {
+                        // Block does not exists. Skip.
+                        continue;
+                    }
                     int sector = MCReader.blockToSector(blockNr);
                     if (lastKnownSector != sector) {
                         lastKnownSector = sector;

diff --git a/Mifare Classic Tool/app/src/main/res/values-v21/colors.xml b/Mifare Classic Tool/app/src/main/res/values-v21/colors.xml
diff --git a/Mifare Classic Tool/app/src/main/res/values-v21/styles.xml b/Mifare Classic Tool/app/src/main/res/values-v21/styles.xml
diff --git a/Mifare Classic Tool/app/src/main/res/values/styles.xml b/Mifare Classic Tool/app/src/main/res/values/styles.xml
@@ -20,5 +20,5 @@
 
 
 <resources>
-    <style name="AppTheme" parent="android:Theme.Holo" />
-</resources>
+    <style name="AppTheme" parent="Theme.AppCompat" />
+</resources>