From 43720032939dad985d413e193e235552c581f94d Mon Sep 17 00:00:00 2001
From: Deun Lee <deunlee@deunlee.com>
Date: Thu, 24 Aug 2023 22:26:43 +0900
Subject: [PATCH 1/3] Add Hide Identical Sectors option

---
 .../Activities/DiffTool.java                  |  26 ++++
 .../main/res/layout/activity_diff_tool.xml    | 113 ++++++++++--------
 .../app/src/main/res/values/strings.xml       |   1 +
 3 files changed, 91 insertions(+), 49 deletions(-)

diff --git a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/DiffTool.java b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/DiffTool.java
index 6e73dbb3..c3ebbdc8 100644
--- a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/DiffTool.java	
+++ b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/DiffTool.java	
@@ -27,6 +27,7 @@
 import android.util.SparseArray;
 import android.view.View;
 import android.widget.Button;
+import android.widget.CheckBox;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -59,6 +60,7 @@ public class DiffTool extends BasicActivity {
     private LinearLayout mDiffContent;
     private Button mDumpFileButton1;
     private Button mDumpFileButton2;
+    private CheckBox mDumpHideIdentical;
     private SparseArray<String[]> mDump1;
     private SparseArray<String[]> mDump2;
 
@@ -74,6 +76,7 @@ protected void onCreate(Bundle savedInstanceState) {
         mDiffContent = findViewById(R.id.linearLayoutDiffTool);
         mDumpFileButton1 = findViewById(R.id.buttonDiffToolDump1);
         mDumpFileButton2 = findViewById(R.id.buttonDiffToolDump2);
+        mDumpHideIdentical = findViewById(R.id.checkBoxDiffToolHideIdentical);
 
         // Check if one or both dumps are already chosen via Intent
         // (from DumpEditor).
@@ -145,6 +148,21 @@ private void runDiff() {
                     continue;
                 }
 
+                // If the Hide Identical Sectors is checked,
+                // Do not display the same sector.
+                if (mDumpHideIdentical.isChecked() && blocks.length > 1) {
+                    int block;
+                    for (block = 0; block < blocks.length; block++) {
+                        if (blocks[block].length != 0) {
+                            break;
+                        }
+                    }
+                    if (block == blocks.length) {
+                        // Identical sector.
+                        continue;
+                    }
+                }
+
                 // Add sector header.
                 TextView header = new TextView(this);
                 TextViewCompat.setTextAppearance(header,
@@ -241,6 +259,14 @@ public void onChooseDump2(View view) {
         startActivityForResult(intent, FILE_CHOOSER_DUMP_FILE_2);
     }
 
+    /**
+     * Run diff if the Hide Identical Sectors option is changed.
+     * @see #runDiff()
+     */
+    public void onHideIdenticalChanged(View view) {
+        runDiff();
+    }
+
     /**
      * Get the {@link FileChooser#EXTRA_CHOSEN_FILE} from the Intend,
      * read the file, check it for errors using
diff --git a/Mifare Classic Tool/app/src/main/res/layout/activity_diff_tool.xml b/Mifare Classic Tool/app/src/main/res/layout/activity_diff_tool.xml
index ee0b36e2..3321abf7 100644
--- a/Mifare Classic Tool/app/src/main/res/layout/activity_diff_tool.xml	
+++ b/Mifare Classic Tool/app/src/main/res/layout/activity_diff_tool.xml	
@@ -19,56 +19,76 @@
 -->
 
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/relativeLayoutDiffTool"
+    android:id="@+id/linearLayoutDiffToolTop"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="5dp"
+    android:orientation="vertical"
     tools:context="Activities.DiffTool" >
 
-    <Button
-        android:id="@+id/buttonDiffToolDump1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:layout_toRightOf="@+id/textViewDiffToolDump1"
-        android:gravity="left|center_vertical"
-        android:onClick="onChooseDump1"
-        android:text="@string/action_chose_dump" />
+    <RelativeLayout
+        android:id="@+id/relativeLayoutDiffTool"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-    <TextView
-        android:id="@+id/textViewDiffToolDump1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/buttonDiffToolDump1"
-        android:layout_alignBottom="@+id/buttonDiffToolDump1"
-        android:layout_alignParentLeft="true"
-        android:paddingRight="5dp"
-        android:text="@string/text_dump_1"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
+        <Button
+            android:id="@+id/buttonDiffToolDump1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentTop="true"
+            android:layout_alignParentRight="true"
+            android:layout_toRightOf="@+id/textViewDiffToolDump1"
+            android:gravity="left|center_vertical"
+            android:onClick="onChooseDump1"
+            android:text="@string/action_chose_dump" />
 
-    <Button
-        android:id="@+id/buttonDiffToolDump2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/buttonDiffToolDump1"
-        android:layout_alignParentRight="true"
-        android:layout_below="@+id/buttonDiffToolDump1"
-        android:gravity="left|center_vertical"
-        android:onClick="onChooseDump2"
-        android:text="@string/action_chose_dump" />
+        <TextView
+            android:id="@+id/textViewDiffToolDump1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBaseline="@+id/buttonDiffToolDump1"
+            android:layout_alignBottom="@+id/buttonDiffToolDump1"
+            android:layout_alignParentLeft="true"
+            android:paddingRight="5dp"
+            android:text="@string/text_dump_1"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <TextView
-        android:id="@+id/textViewDiffToolDump2"
-        android:layout_width="wrap_content"
+        <Button
+            android:id="@+id/buttonDiffToolDump2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/buttonDiffToolDump1"
+            android:layout_alignLeft="@+id/buttonDiffToolDump1"
+            android:layout_alignParentRight="true"
+            android:layout_marginLeft="2dp"
+            android:layout_marginTop="0dp"
+            android:layout_marginRight="-1dp"
+            android:gravity="left|center_vertical"
+            android:onClick="onChooseDump2"
+            android:text="@string/action_chose_dump" />
+
+        <TextView
+            android:id="@+id/textViewDiffToolDump2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBaseline="@+id/buttonDiffToolDump2"
+            android:layout_alignBottom="@+id/buttonDiffToolDump2"
+            android:layout_alignParentLeft="true"
+            android:paddingRight="5dp"
+            android:text="@string/text_dump_2"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+    </RelativeLayout>
+
+    <CheckBox
+        android:id="@+id/checkBoxDiffToolHideIdentical"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignBaseline="@+id/buttonDiffToolDump2"
-        android:layout_alignBottom="@+id/buttonDiffToolDump2"
-        android:layout_alignParentLeft="true"
-        android:paddingRight="5dp"
-        android:text="@string/text_dump_2"
+        android:onClick="onHideIdenticalChanged"
+        android:paddingTop="5dp"
+        android:paddingBottom="5dp"
+        android:text="@string/action_hide_identical_sectors"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <!-- Separator -->
@@ -78,27 +98,22 @@
         android:layout_height="2dp"
         android:layout_marginTop="5dp"
         android:layout_marginBottom="5dp"
-        android:layout_below="@+id/buttonDiffToolDump2"
         android:background="@color/light_gray" />
 
     <ScrollView
         android:id="@+id/scrollViewDiffTool"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true"
-        android:layout_below="@+id/separatorDiffTool" >
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
         <LinearLayout
             android:id="@+id/linearLayoutDiffTool"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:orientation="vertical" >
+            android:orientation="vertical">
 
         </LinearLayout>
 
     </ScrollView>
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/Mifare Classic Tool/app/src/main/res/values/strings.xml b/Mifare Classic Tool/app/src/main/res/values/strings.xml
index 12838f86..3d67427a 100644
--- a/Mifare Classic Tool/app/src/main/res/values/strings.xml	
+++ b/Mifare Classic Tool/app/src/main/res/values/strings.xml	
@@ -310,6 +310,7 @@
     <string name="action_multi_purpose_converter">Multi-Purpose Converter</string>
     <string name="action_cyber_chef">Cyber Chef</string>
     <string name="action_open_clone_uid_tool">Open the Clone UID Tool</string>
+    <string name="action_hide_identical_sectors">Hide identical sectors</string>
 
     <!-- Toast messages -->
     <string name="info_new_tag_found">New tag found</string>

From 7c99c05da2e8803bc7af115e399b2f47d595aa58 Mon Sep 17 00:00:00 2001
From: Deun Lee <deunlee@deunlee.com>
Date: Thu, 24 Aug 2023 23:49:39 +0900
Subject: [PATCH 2/3] Show difference between dumps in Diff Tool

---
 .../Activities/DiffTool.java                  | 37 +++++++++++++++++--
 .../app/src/main/res/values/strings.xml       |  1 +
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/DiffTool.java b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/DiffTool.java
index c3ebbdc8..d75cf4ed 100644
--- a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/DiffTool.java	
+++ b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/DiffTool.java	
@@ -131,7 +131,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
      * Run diff if there are two dumps and show the result in the GUI.
      * @see MCDiffUtils#diffIndices(SparseArray, SparseArray)
      */
-    @SuppressLint("SetTextI18n")
+    @SuppressLint({"SetTextI18n", "DefaultLocale"})
     private void runDiff() {
         // Check if both dumps are there.
         if (mDump1 != null && mDump2 != null) {
@@ -139,6 +139,13 @@ private void runDiff() {
             SparseArray<Integer[][]> diff = MCDiffUtils.diffIndices(
                     mDump1, mDump2);
 
+            // Add the difference between dumps.
+            int totalLength = 0;
+            int diffLength = 0;
+            TextView difference = new TextView(this);
+            difference.setPadding(0, Common.dpToPx(10), 0, 0);
+            mDiffContent.addView(difference);
+
             // Walk trough all possible sectors (this way the right
             // order will be guaranteed).
             for (int sector = 0; sector < 40; sector++) {
@@ -148,7 +155,17 @@ private void runDiff() {
                     continue;
                 }
 
-                // If the Hide Identical Sectors is checked,
+                // A sector that exists only in one dump is counted as differences.
+                if (blocks.length == 0 || blocks.length == 1) {
+                    String[] bs = blocks.length == 0
+                        ? mDump1.get(sector) : mDump2.get(sector);
+                    for (String b : bs) {
+                        totalLength += b.length();
+                        diffLength += b.length();
+                    }
+                }
+
+                // If the Hide Identical Sectors option is checked,
                 // Do not display the same sector.
                 if (mDumpHideIdentical.isChecked() && blocks.length > 1) {
                     int block;
@@ -159,6 +176,9 @@ private void runDiff() {
                     }
                     if (block == blocks.length) {
                         // Identical sector.
+                        for (String b : mDump1.get(sector)) {
+                            totalLength += b.length();
+                        }
                         continue;
                     }
                 }
@@ -215,6 +235,8 @@ private void runDiff() {
                     dump1.setText(mDump1.get(sector)[block]);
                     dump2.setText(mDump2.get(sector)[block]);
 
+                    totalLength += mDump1.get(sector)[block].length();
+
                     if (blocks[block].length == 0) {
                         // Set diff line for identical blocks.
                         diffIndex.setTextColor(Color.GREEN);
@@ -226,7 +248,8 @@ private void runDiff() {
                         // Walk through all symbols to populate the diff line.
                         for (int i : blocks[block]) {
                             diffString.setCharAt(i, 'X');
-
+                            // Count the differences.
+                            diffLength++;
                         }
                     }
                     // Add diff entry.
@@ -234,6 +257,14 @@ private void runDiff() {
                     mDiffContent.addView(rl);
                 }
             }
+
+            // Show the difference percentage between two dumps.
+            float percentage = 0;
+            if (totalLength > 0) {
+                percentage = (float)diffLength / totalLength * 100f;
+            }
+            difference.setText(getString(R.string.text_difference_between_dumps) +
+                ": " + String.format("%.2f", percentage) + " %");
         }
     }
 
diff --git a/Mifare Classic Tool/app/src/main/res/values/strings.xml b/Mifare Classic Tool/app/src/main/res/values/strings.xml
index 3d67427a..164a21bb 100644
--- a/Mifare Classic Tool/app/src/main/res/values/strings.xml	
+++ b/Mifare Classic Tool/app/src/main/res/values/strings.xml	
@@ -202,6 +202,7 @@
             to 4.0.0? Please read section \"1.2 Data Storage\" of \"Help and Info\".</string>
     <string name="text_more_converter">More converter (online)</string>
     <string name="text_enter_file_name">Enter a file name</string>
+    <string name="text_difference_between_dumps">Difference between dumps</string>
 
     <!-- Actions (Buttons, Checkboxs, etc. -->
     <string name="action_read_tag">Read Tag</string>

From 8d528e21fc707c10e2cb63e24b980e33ef46649b Mon Sep 17 00:00:00 2001
From: Deun Lee <deunlee@deunlee.com>
Date: Fri, 25 Aug 2023 00:53:42 +0900
Subject: [PATCH 3/3] Fix diff tool layout

---
 .../app/src/main/res/layout/activity_diff_tool.xml       | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Mifare Classic Tool/app/src/main/res/layout/activity_diff_tool.xml b/Mifare Classic Tool/app/src/main/res/layout/activity_diff_tool.xml
index 3321abf7..d76484d8 100644
--- a/Mifare Classic Tool/app/src/main/res/layout/activity_diff_tool.xml	
+++ b/Mifare Classic Tool/app/src/main/res/layout/activity_diff_tool.xml	
@@ -37,8 +37,8 @@
             android:id="@+id/buttonDiffToolDump1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignParentTop="true"
             android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
             android:layout_toRightOf="@+id/textViewDiffToolDump1"
             android:gravity="left|center_vertical"
             android:onClick="onChooseDump1"
@@ -59,12 +59,9 @@
             android:id="@+id/buttonDiffToolDump2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/buttonDiffToolDump1"
             android:layout_alignLeft="@+id/buttonDiffToolDump1"
             android:layout_alignParentRight="true"
-            android:layout_marginLeft="2dp"
-            android:layout_marginTop="0dp"
-            android:layout_marginRight="-1dp"
+            android:layout_below="@+id/buttonDiffToolDump1"
             android:gravity="left|center_vertical"
             android:onClick="onChooseDump2"
             android:text="@string/action_chose_dump" />
@@ -110,7 +107,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:orientation="vertical">
+            android:orientation="vertical" >
 
         </LinearLayout>