Optimize much

.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

.gitignore

@@ -26,3 +26,7 @@ Mifare Classic Tool/app/release
 # OS specific
 **/.DS_Store
 
+.idea
+.vscode
+build
+*.jar

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

Mifare Classic Tool/.gitattributes

@@ -0,0 +1,4 @@
+* text=auto eol=lf
+
+*.bat text eol=crlf
+*.jar binary

Mifare Classic Tool/app/build.gradle

@@ -4,7 +4,6 @@ plugins {
 
 android {
  compileSdkVersion 31
- buildToolsVersion '31.0.0'
 
  defaultConfig {
  applicationId "de.syss.MifareClassicTool"

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);

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";

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.

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();
 }

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);
  }

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);

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();
  }
-}
+}

Mifare Classic Tool/app/src/main/java/de/syss/MifareClassicTool/Activities/ReadTag.java

@@ -71,23 +71,21 @@ 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;
  } else {
  // Read Tag.
  readTag();
  }
- break;
  }
  }
 

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++,