updated

AndroidCrypto · Aug 29, 2024 · 5b2521c · 5b2521c
1 parent 782e396
commit 5b2521c
Show file tree

Hide file tree

Showing 19 changed files with 81 additions and 113 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,11 +3,11 @@ plugins {
 }
 
 android {
-    namespace 'de.androidcrypto.mifare_ultralight_c_examples'
+    namespace 'de.androidcrypto.mifare_ultralight_c_explorer'
     compileSdk 34
 
     defaultConfig {
-        applicationId "de.androidcrypto.mifare_ultralight_c_examples"
+        applicationId "de.androidcrypto.mifare_ultralight_c_explorer"
         minSdk 21
         targetSdk 34
         versionCode 1

diff --git a/...t_c_examples/ExampleInstrumentedTest.java → ...t_c_explorer/ExampleInstrumentedTest.java b/...t_c_examples/ExampleInstrumentedTest.java → ...t_c_explorer/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package de.androidcrypto.mifare_ultralight_c_examples;
+package de.androidcrypto.mifare_ultralight_c_explorer;
 
 import android.content.Context;
 

diff --git a/...are_ultralight_c_examples/HexDumpOwn.java → ...are_ultralight_c_explorer/HexDumpOwn.java b/...are_ultralight_c_examples/HexDumpOwn.java → ...are_ultralight_c_explorer/HexDumpOwn.java
@@ -1,4 +1,4 @@
-package de.androidcrypto.mifare_ultralight_c_examples;
+package de.androidcrypto.mifare_ultralight_c_explorer;
 
 public class HexDumpOwn {
 

diff --git a/...e_ultralight_c_examples/HomeFragment.java → ...e_ultralight_c_explorer/HomeFragment.java b/...e_ultralight_c_examples/HomeFragment.java → ...e_ultralight_c_explorer/HomeFragment.java
@@ -1,7 +1,5 @@
-package de.androidcrypto.mifare_ultralight_c_examples;
+package de.androidcrypto.mifare_ultralight_c_explorer;
 
-import android.content.Context;
-import android.content.pm.FeatureInfo;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;

diff --git a/...ht_c_examples/LicensesDialogFragment.java → ...ht_c_explorer/LicensesDialogFragment.java b/...ht_c_examples/LicensesDialogFragment.java → ...ht_c_explorer/LicensesDialogFragment.java
@@ -1,4 +1,4 @@
-package de.androidcrypto.mifare_ultralight_c_examples;
+package de.androidcrypto.mifare_ultralight_c_explorer;
 
 import android.app.AlertDialog;
 import android.app.Dialog;

diff --git a/...light_c_examples/MIFARE_Ultralight_C.java → ...light_c_explorer/MIFARE_Ultralight_C.java b/...light_c_examples/MIFARE_Ultralight_C.java → ...light_c_explorer/MIFARE_Ultralight_C.java
@@ -1,13 +1,12 @@
-package de.androidcrypto.mifare_ultralight_c_examples;
+package de.androidcrypto.mifare_ultralight_c_explorer;
 
-import static de.androidcrypto.mifare_ultralight_c_examples.Utils.bytesToHexNpe;
-import static de.androidcrypto.mifare_ultralight_c_examples.Utils.combineByteArrays;
-import static de.androidcrypto.mifare_ultralight_c_examples.Utils.hexStringToByteArray;
-import static de.androidcrypto.mifare_ultralight_c_examples.Utils.intFrom2ByteArrayInversed;
-import static de.androidcrypto.mifare_ultralight_c_examples.Utils.printData;
-import static de.androidcrypto.mifare_ultralight_c_examples.Utils.reverseByteArray;
+import static de.androidcrypto.mifare_ultralight_c_explorer.Utils.bytesToHexNpe;
+import static de.androidcrypto.mifare_ultralight_c_explorer.Utils.combineByteArrays;
+import static de.androidcrypto.mifare_ultralight_c_explorer.Utils.hexStringToByteArray;
+import static de.androidcrypto.mifare_ultralight_c_explorer.Utils.intFrom2ByteArrayInversed;
+import static de.androidcrypto.mifare_ultralight_c_explorer.Utils.printData;
+import static de.androidcrypto.mifare_ultralight_c_explorer.Utils.reverseByteArray;
 
-import android.nfc.Tag;
 import android.nfc.tech.NfcA;
 import android.util.Log;
 

diff --git a/...e_ultralight_c_examples/MainActivity.java → ...e_ultralight_c_explorer/MainActivity.java b/...e_ultralight_c_examples/MainActivity.java → ...e_ultralight_c_explorer/MainActivity.java
@@ -1,4 +1,4 @@
-package de.androidcrypto.mifare_ultralight_c_examples;
+package de.androidcrypto.mifare_ultralight_c_explorer;
 
 import android.os.Bundle;
 

diff --git a/...e_ultralight_c_examples/ReadFragment.java → ...e_ultralight_c_explorer/ReadFragment.java b/...e_ultralight_c_examples/ReadFragment.java → ...e_ultralight_c_explorer/ReadFragment.java
@@ -1,16 +1,16 @@
-package de.androidcrypto.mifare_ultralight_c_examples;
-
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.authenticateUltralightC;
-
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.customAuthKey;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.defaultAuthKey;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.getCounterValue;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.identifyUltralightFamily;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.increaseCounterValueByOne;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.readCompleteContent;
-import static de.androidcrypto.mifare_ultralight_c_examples.Utils.bytesToHexNpe;
-import static de.androidcrypto.mifare_ultralight_c_examples.Utils.doVibrate;
-import android.content.Context;
+package de.androidcrypto.mifare_ultralight_c_explorer;
+
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.authenticateUltralightC;
+
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.customAuthKey;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.defaultAuthKey;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.getCounterValue;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.identifyUltralightFamily;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.increaseCounterValueByOne;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.readCompleteContent;
+import static de.androidcrypto.mifare_ultralight_c_explorer.Utils.bytesToHexNpe;
+import static de.androidcrypto.mifare_ultralight_c_explorer.Utils.doVibrate;
+
 import android.content.Intent;
 import android.graphics.Color;
 import android.media.MediaPlayer;

diff --git a/...tralight_c_examples/ReadFragment_Old.java → ...tralight_c_explorer/ReadFragment_Old.java b/...tralight_c_examples/ReadFragment_Old.java → ...tralight_c_explorer/ReadFragment_Old.java
@@ -1,19 +1,19 @@
-package de.androidcrypto.mifare_ultralight_c_examples;
-
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.authenticateUltralightC;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.customAuthKey;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.defaultAuthKey;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.getCounterValue;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.identifyUltralightFamily;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.increaseCounterValueByOne;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.readCompleteContent;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.readPageMifareUltralight;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.writeAuth0UltralightC;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.writeAuth1UltralightC;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.writePageMifareUltralightC;
-import static de.androidcrypto.mifare_ultralight_c_examples.Utils.bytesToHexNpe;
-import static de.androidcrypto.mifare_ultralight_c_examples.Utils.doVibrate;
-import static de.androidcrypto.mifare_ultralight_c_examples.Utils.printData;
+package de.androidcrypto.mifare_ultralight_c_explorer;
+
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.authenticateUltralightC;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.customAuthKey;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.defaultAuthKey;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.getCounterValue;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.identifyUltralightFamily;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.increaseCounterValueByOne;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.readCompleteContent;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.readPageMifareUltralight;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.writeAuth0UltralightC;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.writeAuth1UltralightC;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.writePageMifareUltralightC;
+import static de.androidcrypto.mifare_ultralight_c_explorer.Utils.bytesToHexNpe;
+import static de.androidcrypto.mifare_ultralight_c_explorer.Utils.doVibrate;
+import static de.androidcrypto.mifare_ultralight_c_explorer.Utils.printData;
 
 import android.content.Context;
 import android.content.Intent;

diff --git a/...ralight_c_examples/TagIdentification.java → ...ralight_c_explorer/TagIdentification.java b/...ralight_c_examples/TagIdentification.java → ...ralight_c_explorer/TagIdentification.java
@@ -1,4 +1,4 @@
-package de.androidcrypto.mifare_ultralight_c_examples;
+package de.androidcrypto.mifare_ultralight_c_explorer;
 
 import android.nfc.Tag;
 import android.nfc.tech.IsoDep;

diff --git a/...ralight_c_examples/Ultralight_Commands.md → ...ralight_c_explorer/Ultralight_Commands.md b/...ralight_c_examples/Ultralight_Commands.md → ...ralight_c_explorer/Ultralight_Commands.md
diff --git a/...o/mifare_ultralight_c_examples/Utils.java → ...o/mifare_ultralight_c_explorer/Utils.java b/...o/mifare_ultralight_c_examples/Utils.java → ...o/mifare_ultralight_c_explorer/Utils.java
@@ -1,4 +1,4 @@
-package de.androidcrypto.mifare_ultralight_c_examples;
+package de.androidcrypto.mifare_ultralight_c_explorer;
 
 import static android.content.Context.VIBRATOR_SERVICE;
 

diff --git a/..._examples/WriteConfigurationFragment.java → ..._explorer/WriteConfigurationFragment.java b/..._examples/WriteConfigurationFragment.java → ..._explorer/WriteConfigurationFragment.java
@@ -1,15 +1,15 @@
-package de.androidcrypto.mifare_ultralight_c_examples;
-
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.authenticateUltralightC;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.customAuthKey;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.defaultAuthKey;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.identifyUltralightFamily;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.writeAuth0UltralightC;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.writeAuth1UltralightC;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.writePageMifareUltralightC;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.writePasswordUltralightC;
-import static de.androidcrypto.mifare_ultralight_c_examples.Utils.bytesToHexNpe;
-import static de.androidcrypto.mifare_ultralight_c_examples.Utils.doVibrate;
+package de.androidcrypto.mifare_ultralight_c_explorer;
+
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.authenticateUltralightC;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.customAuthKey;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.defaultAuthKey;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.identifyUltralightFamily;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.writeAuth0UltralightC;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.writeAuth1UltralightC;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.writePageMifareUltralightC;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.writePasswordUltralightC;
+import static de.androidcrypto.mifare_ultralight_c_explorer.Utils.bytesToHexNpe;
+import static de.androidcrypto.mifare_ultralight_c_explorer.Utils.doVibrate;
 
 import android.content.Intent;
 import android.media.MediaPlayer;

diff --git a/...ight_c_examples/WriteCounterFragment.java → ...ight_c_explorer/WriteCounterFragment.java b/...ight_c_examples/WriteCounterFragment.java → ...ight_c_explorer/WriteCounterFragment.java
@@ -1,13 +1,13 @@
-package de.androidcrypto.mifare_ultralight_c_examples;
-
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.authenticateUltralightC;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.customAuthKey;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.doAuthenticateUltralightCDefault;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.getCounterValue;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.identifyUltralightFamily;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.increaseCounterValueByOne;
-import static de.androidcrypto.mifare_ultralight_c_examples.Utils.bytesToHexNpe;
-import static de.androidcrypto.mifare_ultralight_c_examples.Utils.doVibrate;
+package de.androidcrypto.mifare_ultralight_c_explorer;
+
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.authenticateUltralightC;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.customAuthKey;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.doAuthenticateUltralightCDefault;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.getCounterValue;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.identifyUltralightFamily;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.increaseCounterValueByOne;
+import static de.androidcrypto.mifare_ultralight_c_explorer.Utils.bytesToHexNpe;
+import static de.androidcrypto.mifare_ultralight_c_explorer.Utils.doVibrate;
 import android.content.Intent;
 import android.media.MediaPlayer;
 import android.nfc.NfcAdapter;

diff --git a/..._ultralight_c_examples/WriteFragment.java → ..._ultralight_c_explorer/WriteFragment.java b/..._ultralight_c_examples/WriteFragment.java → ..._ultralight_c_explorer/WriteFragment.java
@@ -1,20 +1,19 @@
-package de.androidcrypto.mifare_ultralight_c_examples;
-
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.authenticateUltralightC;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.customAuthKey;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.defaultAuthKey;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.identifyUltralightFamily;
-import static de.androidcrypto.mifare_ultralight_c_examples.MIFARE_Ultralight_C.writePageMifareUltralightC;
-import static de.androidcrypto.mifare_ultralight_c_examples.Utils.bytesToHexNpe;
-import static de.androidcrypto.mifare_ultralight_c_examples.Utils.doVibrate;
-import static de.androidcrypto.mifare_ultralight_c_examples.Utils.getTimestampShort;
-import static de.androidcrypto.mifare_ultralight_c_examples.Utils.printData;
+package de.androidcrypto.mifare_ultralight_c_explorer;
+
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.authenticateUltralightC;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.customAuthKey;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.defaultAuthKey;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.identifyUltralightFamily;
+import static de.androidcrypto.mifare_ultralight_c_explorer.MIFARE_Ultralight_C.writePageMifareUltralightC;
+import static de.androidcrypto.mifare_ultralight_c_explorer.Utils.bytesToHexNpe;
+import static de.androidcrypto.mifare_ultralight_c_explorer.Utils.doVibrate;
+import static de.androidcrypto.mifare_ultralight_c_explorer.Utils.getTimestampShort;
+import static de.androidcrypto.mifare_ultralight_c_explorer.Utils.printData;
 
 import android.content.Intent;
 import android.media.MediaPlayer;
 import android.nfc.NfcAdapter;
 import android.nfc.Tag;
-import android.nfc.tech.MifareUltralight;
 import android.nfc.tech.NfcA;
 import android.os.Bundle;
 import android.provider.Settings;

diff --git a/app/src/main/res/menu/bottom_menu_old.xml b/app/src/main/res/menu/bottom_menu_old.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">MIFARE Ultralight C Example</string>
+    <string name="app_name">MIFARE Ultralight C Explorer</string>
     <string name="home_description">This application reads and writes data from/to a MIFARE Ultralight C NFC tag.</string>
     <string name="home_fragments">There are 5 icons to click on:\n1 home = this page\n2 read data with or without authentication\n3 write counter = increment the counter\n4 write data\n5  write configuration = changes the configuration of the tag (e.g. authentication key, write and/or read authentication, memory clearing, change password)</string>
     <string name="header_read">This app works with a MIFARE Ultralight C tag for reading</string>

diff --git a/...ltralight_c_examples/ExampleUnitTest.java → ...ltralight_c_explorer/ExampleUnitTest.java b/...ltralight_c_examples/ExampleUnitTest.java → ...ltralight_c_explorer/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package de.androidcrypto.mifare_ultralight_c_examples;
+package de.androidcrypto.mifare_ultralight_c_explorer;
 
 import org.junit.Test;
 

diff --git a/settings.gradle b/settings.gradle
@@ -19,5 +19,5 @@ dependencyResolutionManagement {
     }
 }
 
-rootProject.name = "MIFARE_Ultralight_C_Examples"
+rootProject.name = "MIFARE_Ultralight_C_Explorer"
 include ':app'