diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000..58bd740f --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,28 @@ +name: CI + +on: + push: + paths: + - '.github/workflows/ci.yaml' + - 'Mifare Classic Tool/**' + pull_request: + paths: + - '.github/workflows/ci.yaml' + - 'Mifare Classic Tool/**' + +env: + PROJECT_PATH: Mifare Classic Tool + +jobs: + build: + name: Build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/cache@v2 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle/wrapper/gradle-wrapper.properties', '**/buildSrc/src/main/kotlin/**.kt') }} + - name: Build + working-directory: ${{ env.PROJECT_PATH }} + run: ./gradlew --parallel assembleRelease diff --git a/.gitignore b/.gitignore index 801f61ef..dc975df3 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,7 @@ Mifare Classic Tool/app/release # OS specific **/.DS_Store +.idea +.vscode +build +*.jar diff --git a/Mifare Classic Tool/.editorconfig b/Mifare Classic Tool/.editorconfig new file mode 100644 index 00000000..77410ffa --- /dev/null +++ b/Mifare Classic Tool/.editorconfig @@ -0,0 +1,11 @@ +root = true + +[*] +charset = utf-8 +indent_size = 4 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true + +[{*.yml,yaml}] +indent_size = 2 diff --git a/Mifare Classic Tool/.gitattributes b/Mifare Classic Tool/.gitattributes new file mode 100644 index 00000000..411c0777 --- /dev/null +++ b/Mifare Classic Tool/.gitattributes @@ -0,0 +1,4 @@ +* text=auto eol=lf + +*.bat text eol=crlf +*.jar binary diff --git a/Mifare Classic Tool/app/build.gradle b/Mifare Classic Tool/app/build.gradle index 7b479210..2508e7c1 100755 --- a/Mifare Classic Tool/app/build.gradle +++ b/Mifare Classic Tool/app/build.gradle @@ -4,7 +4,6 @@ plugins { android { compileSdkVersion 31 - buildToolsVersion '31.0.0' defaultConfig { applicationId "de.syss.MifareClassicTool" diff --git a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/CloneUidTool.java b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/CloneUidTool.java index d18743d3..e7f58a34 100644 --- a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/CloneUidTool.java +++ b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/CloneUidTool.java @@ -79,7 +79,7 @@ protected void onCreate(Bundle savedInstanceState) { R.id.editTextCloneUidToolWriteKey); mStatusLogContent = findViewById( R.id.textViewCloneUidToolStatusLogContent); - mShowOptions = (CheckBox) findViewById( + mShowOptions = findViewById( R.id.checkBoxCloneUidToolOptions); mRadioButtonKeyB = findViewById( R.id.radioButtonCloneUidToolKeyB); @@ -390,7 +390,7 @@ private void appendToLog(String text) { * (in this case the "show options" check box). */ public void onShowOptions(View view) { - LinearLayout optionsLayout = (LinearLayout) findViewById( + LinearLayout optionsLayout = findViewById( R.id.linearLayoutOptions); if (mShowOptions.isChecked()) { optionsLayout.setVisibility(View.VISIBLE); diff --git a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/DumpEditor.java b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/DumpEditor.java index d394d644..84747806 100644 --- a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/DumpEditor.java +++ b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/DumpEditor.java @@ -436,9 +436,9 @@ private void saveFile(final String[] data, final String fileName, View dialogLayout = getLayoutInflater().inflate( R.layout.dialog_save_file, findViewById(android.R.id.content), false); - TextView message = (TextView) dialogLayout.findViewById( + TextView message = dialogLayout.findViewById( R.id.textViewDialogSaveFileMessage); - final EditText input = (EditText) dialogLayout.findViewById( + final EditText input = dialogLayout.findViewById( R.id.editTextDialogSaveFileName); message.setText(messageId); input.setText(fileName); @@ -975,7 +975,7 @@ private void saveKeys() { if (mDumpName == null) { mKeysName = "UID_" + mUID; } else { - mKeysName = new String(mDumpName); + mKeysName = mDumpName; } } mKeysName += ".keys"; diff --git a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/FileChooser.java b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/FileChooser.java index 05552747..44085a68 100644 --- a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/FileChooser.java +++ b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/FileChooser.java @@ -332,9 +332,9 @@ private void onNewFile() { View dialogLayout = getLayoutInflater().inflate( R.layout.dialog_save_file, findViewById(android.R.id.content), false); - TextView message = (TextView) dialogLayout.findViewById( + TextView message = dialogLayout.findViewById( R.id.textViewDialogSaveFileMessage); - final EditText input = (EditText) dialogLayout.findViewById( + final EditText input = dialogLayout.findViewById( R.id.editTextDialogSaveFileName); message.setText(R.string.dialog_new_file); input.setText(prefill); @@ -344,14 +344,9 @@ private void onNewFile() { // Show keyboard. InputMethodManager imm = (InputMethodManager) getSystemService( Context.INPUT_METHOD_SERVICE); - input.postDelayed(new Runnable() - { - @Override - public void run() - { - input.requestFocus(); - imm.showSoftInput(input, 0); - } + input.postDelayed(() -> { + input.requestFocus(); + imm.showSoftInput(input, 0); }, 100); // Ask user for filename. diff --git a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/IActivityThatReactsToSave.java b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/IActivityThatReactsToSave.java index 94e667c8..6eb52d49 100644 --- a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/IActivityThatReactsToSave.java +++ b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/IActivityThatReactsToSave.java @@ -31,12 +31,12 @@ public interface IActivityThatReactsToSave { /** * This method will be called after a successful save process. */ - public abstract void onSaveSuccessful(); + void onSaveSuccessful(); /** * This method will be called, if there was an error during the * save process or it the user hits "cancel" in the "file already exists" * dialog. */ - public abstract void onSaveFailure(); + void onSaveFailure(); } diff --git a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/ImportExportTool.java b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/ImportExportTool.java index 137c1285..be829ab0 100644 --- a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/ImportExportTool.java +++ b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/ImportExportTool.java @@ -32,6 +32,8 @@ import android.view.View; import android.widget.Toast; +import androidx.annotation.NonNull; + import org.json.JSONException; import org.json.JSONObject; @@ -97,6 +99,7 @@ private enum FileType { this.text = text; } + @NonNull @Override public String toString() { return text; @@ -488,7 +491,7 @@ private void saveConvertedDataToContent(String[] convertedContent, Toast.LENGTH_LONG).show(); return; } - boolean success = false; + boolean success; if (mFileType != FileType.BIN) { success = Common.saveFile(contentDestination, convertedContent, this); } else { @@ -551,7 +554,7 @@ private String[] convertDump(String[] source, FileType srcType, Common.isValidDumpErrorToast(err, this); return null; } - int sectorNumber = 0; + int sectorNumber; int blockNumber = 0; for (String line : source) { if (line.startsWith("+")) { @@ -624,7 +627,7 @@ private String[] convertDump(String[] source, FileType srcType, return null; } - JSONObject blocks = null; + JSONObject blocks; try { JSONObject parsedJson = new JSONObject(TextUtils.join("", json)); blocks = parsedJson.getJSONObject("blocks"); @@ -886,7 +889,7 @@ private boolean backupDumpsAndKeys(Uri contentDestUri) { file.getAbsolutePath().substring(commonPathLen)); entry.setTime(file.lastModified()); out.putNextEntry(entry); - int count = 0; + int count; while ((count = origin.read(data, 0, BUFFER)) != -1) { out.write(data, 0, count); } diff --git a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/KeyEditor.java b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/KeyEditor.java index 53ef0073..101da7da 100644 --- a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/KeyEditor.java +++ b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/KeyEditor.java @@ -312,9 +312,9 @@ private void onSave() { View dialogLayout = getLayoutInflater().inflate( R.layout.dialog_save_file, findViewById(android.R.id.content), false); - TextView message = (TextView) dialogLayout.findViewById( + TextView message = dialogLayout.findViewById( R.id.textViewDialogSaveFileMessage); - final EditText input = (EditText) dialogLayout.findViewById( + final EditText input = dialogLayout.findViewById( R.id.editTextDialogSaveFileName); message.setText(R.string.dialog_save_keys); input.setText(mFileName); diff --git a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/Preferences.java b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/Preferences.java index a5e862a5..f1d42beb 100644 --- a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/Preferences.java +++ b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/Preferences.java @@ -31,6 +31,8 @@ import android.widget.RadioGroup; import android.widget.Toast; +import androidx.annotation.NonNull; + import de.syss.MifareClassicTool.Common; import de.syss.MifareClassicTool.R; @@ -62,6 +64,7 @@ public enum Preference { this.text = text; } + @NonNull @Override public String toString() { return text; @@ -370,4 +373,4 @@ public void onSave(View view) { public void onCancel(View view) { finish(); } -} \ No newline at end of file +} diff --git a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/ReadTag.java b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/ReadTag.java index b33ad68e..bc862ea2 100644 --- a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/ReadTag.java +++ b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/ReadTag.java @@ -71,15 +71,14 @@ public void onCreate(Bundle savedInstanceState) { public void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - switch(requestCode) { - case KEY_MAP_CREATOR: + if (requestCode == KEY_MAP_CREATOR) { if (resultCode != Activity.RESULT_OK) { // Error. if (resultCode == 4) { // Error. Path from the calling intend was null. // (This is really strange and should not occur.) Toast.makeText(this, R.string.info_strange_error, - Toast.LENGTH_LONG).show(); + Toast.LENGTH_LONG).show(); } finish(); return; @@ -87,7 +86,6 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { // Read Tag. readTag(); } - break; } } diff --git a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/WriteTag.java b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/WriteTag.java index e44cf6ed..88cd1176 100644 --- a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/WriteTag.java +++ b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/WriteTag.java @@ -257,12 +257,10 @@ public void onActivityResult(int requestCode, // Error handling for the return value of KeyMapCreator. // So far, only error nr. 4 needs to be handled. - switch (ckmError) { - case 4: - // Error. Path from the calling intend was null. + if (ckmError == 4) {// Error. Path from the calling intend was null. // (This is really strange and should not occur.) Toast.makeText(this, R.string.info_strange_error, - Toast.LENGTH_LONG).show(); + Toast.LENGTH_LONG).show(); } } @@ -872,7 +870,7 @@ private void initDumpWithPosFromDump(String[] dump) { // with the static ones. String newBlock = dump[i].substring(0, 12) + mStaticAC.getText().toString() - + dump[i].substring(18, dump[i].length()); + + dump[i].substring(18); dump[i] = newBlock; } mDumpWithPos.get(sector).put(block++, diff --git a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Common.java b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Common.java index 34baf7da..3b68e533 100644 --- a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Common.java +++ b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Common.java @@ -275,7 +275,7 @@ public static String[] readFileLineByLine(File file, boolean readAll, if (file == null || !file.exists()) { return null; } - String[] ret = null; + String[] ret; BufferedReader reader = null; try { reader = new BufferedReader(new FileReader(file)); @@ -306,8 +306,8 @@ public static String[] readFileLineByLine(File file, boolean readAll, * @see #readLineByLine(BufferedReader, boolean, Context) */ public static String[] readUriLineByLine(Uri uri, boolean readAll, Context context) { - InputStream contentStream = null; - String[] ret = null; + InputStream contentStream; + String[] ret; if (uri == null || context == null) { return null; } @@ -336,7 +336,7 @@ public static String[] readUriLineByLine(Uri uri, boolean readAll, Context conte * an read error. */ public static byte[] readUriRaw(Uri uri, Context context) { - InputStream contentStream = null; + InputStream contentStream; if (uri == null || context == null) { return null; } @@ -372,7 +372,7 @@ public static byte[] readUriRaw(Uri uri, Context context) { */ private static String[] readLineByLine(BufferedReader reader, boolean readAll, Context context) { - String[] ret = null; + String[] ret; String line; ArrayList linesArray = new ArrayList<>(); try { @@ -421,17 +421,14 @@ private static String[] readLineByLine(BufferedReader reader, public static String getFileName(Uri uri, Context context) { String result = null; if (uri.getScheme().equals("content")) { - Cursor cursor = context.getContentResolver().query( - uri, null, null, null, null); - try { + try (Cursor cursor = context.getContentResolver().query( + uri, null, null, null, null)) { if (cursor != null && cursor.moveToFirst()) { int index = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME); if (index >= 0) { result = cursor.getString(index); } } - } finally { - cursor.close(); } } if (result == null) { @@ -580,7 +577,7 @@ public static boolean saveFile(File file, String[] lines, boolean append) { } else { error = true; } - return error == false; + return !error; } /** @@ -608,7 +605,7 @@ public static boolean saveFile(Uri contentUri, String[] lines, Context context) * @return True if file writing was successful. False otherwise. */ public static boolean saveFile(Uri contentUri, byte[] bytes, Context context) { - OutputStream output = null; + OutputStream output; if (contentUri == null || bytes == null || context == null || bytes.length == 0) { return false; } @@ -982,7 +979,6 @@ public static boolean openApp(Context context, String packageName) { *
  • -1 - Can not check because Android version is >= 8.
    • * */ - @SuppressWarnings("deprecation") public static int isExternalNfcServiceRunning(Context context) { // getRunningServices() is deprecated since Android 8. if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { @@ -1325,7 +1321,7 @@ public static byte[] acMatrixToACBytes(byte[][] acMatrix) { * @param hexString The string to check. * @param context The Context in which the Toast will be shown. * @return True if sting is hex an 16 Bytes long, False otherwise. - * @see #isHex(String, Context) + * @see #isHex(String, Context) */ public static boolean isHexAnd16Byte(String hexString, Context context) { boolean isHex = isHex(hexString, context); @@ -1375,14 +1371,12 @@ public static boolean isValueBlock(String hexString) { // For better reading (~ = invert operator): // if (b0=b8 and b0=~b4) and (b1=b9 and b9=~b5) ... // ... and (b12=b14 and b13=b15 and b12=~b13) then - if ( (b[0] == b[8] && (byte)(b[0]^0xFF) == b[4]) && - (b[1] == b[9] && (byte)(b[1]^0xFF) == b[5]) && - (b[2] == b[10] && (byte)(b[2]^0xFF) == b[6]) && - (b[3] == b[11] && (byte)(b[3]^0xFF) == b[7]) && - (b[12] == b[14] && b[13] == b[15] && - (byte)(b[12]^0xFF) == b[13])) { - return true; - } + return (b[0] == b[8] && (byte) (b[0] ^ 0xFF) == b[4]) && + (b[1] == b[9] && (byte) (b[1] ^ 0xFF) == b[5]) && + (b[2] == b[10] && (byte) (b[2] ^ 0xFF) == b[6]) && + (b[3] == b[11] && (byte) (b[3] ^ 0xFF) == b[7]) && + (b[12] == b[14] && b[13] == b[15] && + (byte) (b[12] ^ 0xFF) == b[13]); } return false; } @@ -1634,7 +1628,7 @@ public static boolean isValidBlock0(String block0, int uidLen, int tagSize, // Byte3. if (valid && (uidLen == 7 || uidLen == 10)) { // The 3rd byte of a double/triple sized UID shall not be 0x88. - valid = !block0.substring(4, 6).equals("88"); + valid = !block0.startsWith("88", 4); } // ATQA. // Check if there is a special ATQA tied to MIFARE SmartMX or TNP3xxx. @@ -1813,7 +1807,7 @@ public static String hex2Ascii(String hex) { return null; } byte[] bytes = hex2Bytes(hex); - String ret = null; + String ret; // Replace non printable ASCII with ".". for(int i = 0; i < bytes.length; i++) { if (bytes[i] < (byte)0x20 || bytes[i] == (byte)0x7F) { diff --git a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/MCReader.java b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/MCReader.java index b2111f34..cdb775de 100644 --- a/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/MCReader.java +++ b/Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/MCReader.java @@ -21,7 +21,6 @@ import android.content.Context; import android.nfc.Tag; import android.nfc.TagLostException; -import android.nfc.tech.IsoDep; import android.nfc.tech.MifareClassic; import android.nfc.tech.NfcA; import android.os.Bundle; @@ -31,8 +30,6 @@ import android.util.SparseArray; import android.widget.Toast; -import androidx.core.content.res.TypedArrayUtils; - import java.io.File; import java.io.IOException; import java.util.ArrayList; diff --git a/Mifare Classic Tool/build.gradle b/Mifare Classic Tool/build.gradle index 992ca413..23051200 100755 --- a/Mifare Classic Tool/build.gradle +++ b/Mifare Classic Tool/build.gradle @@ -1,17 +1,17 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { - jcenter() google() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.3' + classpath 'com.android.tools.build:gradle:7.0.4' } } allprojects { repositories { - jcenter() google() + mavenCentral() } } diff --git a/Mifare Classic Tool/gradle/wrapper/gradle-wrapper.jar b/Mifare Classic Tool/gradle/wrapper/gradle-wrapper.jar index 8c0fb64a..7454180f 100644 Binary files a/Mifare Classic Tool/gradle/wrapper/gradle-wrapper.jar and b/Mifare Classic Tool/gradle/wrapper/gradle-wrapper.jar differ diff --git a/Mifare Classic Tool/gradle/wrapper/gradle-wrapper.properties b/Mifare Classic Tool/gradle/wrapper/gradle-wrapper.properties index dfc6c292..2e6e5897 100644 --- a/Mifare Classic Tool/gradle/wrapper/gradle-wrapper.properties +++ b/Mifare Classic Tool/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Wed Oct 14 22:20:49 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip diff --git a/Mifare Classic Tool/gradlew b/Mifare Classic Tool/gradlew index 91a7e269..1b6c7873 100755 --- a/Mifare Classic Tool/gradlew +++ b/Mifare Classic Tool/gradlew @@ -1,79 +1,129 @@ -#!/usr/bin/env bash +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum -warn ( ) { +warn () { echo "$*" -} +} >&2 -die ( ) { +die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -82,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -90,75 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") -} -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" - -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/Mifare Classic Tool/gradlew.bat b/Mifare Classic Tool/gradlew.bat index aec99730..107acd32 100644 --- a/Mifare Classic Tool/gradlew.bat +++ b/Mifare Classic Tool/gradlew.bat @@ -1,90 +1,89 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega