Merge pull request #13 from CodeDead/release/1.7.5

CodeDead · web-flow · commit 6981f7588698 · 2021-07-06T17:31:54.000+02:00
Release/1.7.5
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,9 +7,9 @@ android {
         applicationId "com.codedead.deadhash"
         minSdkVersion 24
         targetSdkVersion 30
-        versionName '1.7.4'
+        versionName '1.7.5'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        versionCode 5
+        versionCode 6
     }
     buildTypes {
         release {
@@ -27,11 +27,11 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', {
+    androidTestImplementation('androidx.test.espresso:espresso-core:3.4.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     testImplementation 'junit:junit:4.13.2'
     implementation 'androidx.cardview:cardview:1.0.0'
diff --git a/app/src/main/java/com/codedead/deadhash/domain/objects/hashgenerator/HashData.java b/app/src/main/java/com/codedead/deadhash/domain/objects/hashgenerator/HashData.java
@@ -46,7 +46,8 @@ public HashData[] newArray(final int size) {
     }
 
     private HashData(final Parcel in) {
-        if (in == null) throw new NullPointerException("Parcel cannot be null!");
+        if (in == null)
+            throw new NullPointerException("Parcel cannot be null!");
 
         hashName = in.readString();
         hashData = in.readString();
diff --git a/app/src/main/java/com/codedead/deadhash/domain/objects/hashgenerator/HashGenerator.java b/app/src/main/java/com/codedead/deadhash/domain/objects/hashgenerator/HashGenerator.java
@@ -53,6 +53,9 @@ public HashGenerator(final File data, final List<HashAlgorithm> hashAlgorithms,
      * @throws IOException When the File could not be read
      */
     private byte[] readFileToBytes(final File file) throws IOException {
+        if (file == null)
+            throw new NullPointerException("File cannot be null!");
+
         final int size = (int) file.length();
         final byte[] bytes = new byte[size];
         final byte[] tmpBuff = new byte[size];
diff --git a/app/src/main/java/com/codedead/deadhash/domain/objects/settings/SettingsContainer.java b/app/src/main/java/com/codedead/deadhash/domain/objects/settings/SettingsContainer.java
@@ -22,7 +22,7 @@ public class SettingsContainer {
      * Initialize a new SettingsContainer
      */
     public SettingsContainer() {
-
+        // Default constructor
     }
 
     /**
diff --git a/app/src/main/java/com/codedead/deadhash/domain/utils/DataAdapter.java b/app/src/main/java/com/codedead/deadhash/domain/utils/DataAdapter.java
@@ -5,6 +5,7 @@
 import android.content.Context;
 
 import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import android.view.LayoutInflater;
@@ -32,7 +33,6 @@ public DataAdapter(final List<HashData> hashDataList) {
         this.hashDataList = hashDataList;
     }
 
-
     @NonNull
     @Override
     public DataHolder onCreateViewHolder(@NonNull final ViewGroup parent, final int viewType) {
@@ -107,10 +107,12 @@ void bindData(final HashData data) {
 
             if (data.getCompareCheck() != null && data.getCompareCheck().length() != 0) {
                 originalCompare = data.getCompareCheck();
-                if (data.getHashData().toLowerCase().equals(data.getCompareCheck().toLowerCase())) {
+                if (data.getHashData().equalsIgnoreCase(data.getCompareCheck())) {
                     compareData.setImageResource(R.drawable.ic_compare_check);
+                    compareData.setBackgroundTintList(ContextCompat.getColorStateList(compareData.getContext(), R.color.green));
                 } else {
                     compareData.setImageResource(R.drawable.ic_compare_uncheck);
+                    compareData.setBackgroundTintList(ContextCompat.getColorStateList(compareData.getContext(), R.color.red));
                 }
             } else {
                 compareData.setVisibility(View.INVISIBLE);
diff --git a/app/src/main/java/com/codedead/deadhash/domain/utils/HashUtil.java b/app/src/main/java/com/codedead/deadhash/domain/utils/HashUtil.java
@@ -9,7 +9,7 @@ public final class HashUtil {
      * Initialize a new HashUtil
      */
     private HashUtil() {
-        // Empty constructor
+        // Default constructor
     }
 
     /**
@@ -44,7 +44,7 @@ public static String calculateHash(final byte[] bytes, final String kind) {
             md.update(bytes, 0, bytes.length);
             final byte[] hash = md.digest();
             return convertToHex(hash);
-        } catch (Exception ex) {
+        } catch (final Exception ex) {
             return null;
         }
     }
@@ -60,7 +60,7 @@ public static String calculateCRC32(final byte[] bytes) {
             final CRC32 crc = new CRC32();
             crc.update(bytes);
             return Long.toHexString(crc.getValue());
-        } catch (Exception ex) {
+        } catch (final Exception ex) {
             return null;
         }
     }
diff --git a/app/src/main/java/com/codedead/deadhash/domain/utils/IntentUtils.java b/app/src/main/java/com/codedead/deadhash/domain/utils/IntentUtils.java
@@ -23,15 +23,18 @@ private IntentUtils() {
      * @param site    The website that should be opened
      */
     public static void openSite(final Context context, final String site) {
-        if (context == null) throw new NullPointerException("Context cannot be null!");
-        if (site == null) throw new NullPointerException("Site cannot be null!");
-        if (site.length() == 0) throw new IllegalArgumentException("Site cannot be empty!");
+        if (context == null)
+            throw new NullPointerException("Context cannot be null!");
+        if (site == null)
+            throw new NullPointerException("Site cannot be null!");
+        if (site.length() == 0)
+            throw new IllegalArgumentException("Site cannot be empty!");
 
         try {
             final Uri uriUrl = Uri.parse(site);
             final Intent launchBrowser = new Intent(Intent.ACTION_VIEW, uriUrl);
             context.startActivity(launchBrowser);
-        } catch (Exception ex) {
+        } catch (final Exception ex) {
             Toast.makeText(context, context.getString(R.string.error_website), Toast.LENGTH_SHORT).show();
         }
     }
@@ -42,13 +45,14 @@ public static void openSite(final Context context, final String site) {
      * @param context The Context that can be used to open the Play Store
      */
     public static void openPlayStore(final Context context) {
-        if (context == null) throw new NullPointerException("Context cannot be null!");
+        if (context == null)
+            throw new NullPointerException("Context cannot be null!");
 
         final Intent intent = new Intent(Intent.ACTION_VIEW);
         try {
             intent.setData(Uri.parse("market://details?id=com.codedead.deadhash"));
             context.startActivity(intent);
-        } catch (Exception ignored) {
+        } catch (final Exception ignored) {
             Toast.makeText(context, context.getString(R.string.error_playstore), Toast.LENGTH_SHORT).show();
         }
     }
diff --git a/app/src/main/java/com/codedead/deadhash/gui/MainActivity.java b/app/src/main/java/com/codedead/deadhash/gui/MainActivity.java
@@ -337,7 +337,7 @@ private void loadFileHashContent(final Bundle savedInstance) {
                         }));
 
                 pgbFile.setVisibility(View.VISIBLE);
-            } catch (IOException e) {
+            } catch (final IOException e) {
                 Toast.makeText(MainActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();
                 pgbFile.setVisibility(View.GONE);
             }
@@ -690,10 +690,10 @@ protected void onActivityResult(final int requestCode, final int resultCode, @Nu
                             } else {
                                 Toast.makeText(this, R.string.error_open_file, Toast.LENGTH_SHORT).show();
                             }
-                        } catch (IOException ex) {
+                        } catch (final IOException ex) {
                             Toast.makeText(this, R.string.error_copy_file, Toast.LENGTH_SHORT).show();
                         }
-                    } catch (IOException ex) {
+                    } catch (final IOException ex) {
                         Toast.makeText(this, R.string.error_open_file, Toast.LENGTH_SHORT).show();
                     }
                 } else {
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -7,4 +7,6 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="red">#FF0000</color>
+    <color name="green">#00FF00</color>
 </resources>
diff --git a/build.gradle b/build.gradle
@@ -2,11 +2,11 @@
 
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath 'com.android.tools.build:gradle:4.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,7 +15,7 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
+        mavenCentral()
         google()
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Tue Jul 06 16:47:53 CEST 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,8 @@ public HashData[] newArray(final int size) {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`private HashData(final Parcel in) {`
`49`		`- if (in == null) throw new NullPointerException("Parcel cannot be null!");`
	`49`	`+ if (in == null)`
	`50`	`+ throw new NullPointerException("Parcel cannot be null!");`
`50`	`51`
`51`	`52`	`hashName = in.readString();`
`52`	`53`	`hashData = in.readString();`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public class SettingsContainer {`
`22`	`22`	`* Initialize a new SettingsContainer`
`23`	`23`	`*/`
`24`	`24`	`public SettingsContainer() {`
`25`		`-`
	`25`	`+ // Default constructor`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public final class HashUtil {`
`9`	`9`	`* Initialize a new HashUtil`
`10`	`10`	`*/`
`11`	`11`	`private HashUtil() {`
`12`		`- // Empty constructor`
	`12`	`+ // Default constructor`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`/**`
`@@ -44,7 +44,7 @@ public static String calculateHash(final byte[] bytes, final String kind) {`
`44`	`44`	`md.update(bytes, 0, bytes.length);`
`45`	`45`	`final byte[] hash = md.digest();`
`46`	`46`	`return convertToHex(hash);`
`47`		`- } catch (Exception ex) {`
	`47`	`+ } catch (final Exception ex) {`
`48`	`48`	`return null;`
`49`	`49`	`}`
`50`	`50`	`}`
`@@ -60,7 +60,7 @@ public static String calculateCRC32(final byte[] bytes) {`
`60`	`60`	`final CRC32 crc = new CRC32();`
`61`	`61`	`crc.update(bytes);`
`62`	`62`	`return Long.toHexString(crc.getValue());`
`63`		`- } catch (Exception ex) {`
	`63`	`+ } catch (final Exception ex) {`
`64`	`64`	`return null;`
`65`	`65`	`}`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,7 @@ private void loadFileHashContent(final Bundle savedInstance) {`
`337`	`337`	`}));`
`338`	`338`
`339`	`339`	`pgbFile.setVisibility(View.VISIBLE);`
`340`		`- } catch (IOException e) {`
	`340`	`+ } catch (final IOException e) {`
`341`	`341`	`Toast.makeText(MainActivity.this, e.getMessage(), Toast.LENGTH_SHORT).show();`
`342`	`342`	`pgbFile.setVisibility(View.GONE);`
`343`	`343`	`}`
`@@ -690,10 +690,10 @@ protected void onActivityResult(final int requestCode, final int resultCode, @Nu`
`690`	`690`	`} else {`
`691`	`691`	`Toast.makeText(this, R.string.error_open_file, Toast.LENGTH_SHORT).show();`
`692`	`692`	`}`
`693`		`- } catch (IOException ex) {`
	`693`	`+ } catch (final IOException ex) {`
`694`	`694`	`Toast.makeText(this, R.string.error_copy_file, Toast.LENGTH_SHORT).show();`
`695`	`695`	`}`
`696`		`- } catch (IOException ex) {`
	`696`	`+ } catch (final IOException ex) {`
`697`	`697`	`Toast.makeText(this, R.string.error_open_file, Toast.LENGTH_SHORT).show();`
`698`	`698`	`}`
`699`	`699`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,11 @@`
`2`	`2`
`3`	`3`	`buildscript {`
`4`	`4`	`repositories {`
`5`		`- jcenter()`
	`5`	`+ mavenCentral()`
`6`	`6`	`google()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:4.1.2'`
	`9`	`+ classpath 'com.android.tools.build:gradle:4.2.2'`
`10`	`10`
`11`	`11`	`// NOTE: Do not place your application dependencies here; they belong`
`12`	`12`	`// in the individual module build.gradle files`
`@@ -15,7 +15,7 @@ buildscript {`
`15`	`15`
`16`	`16`	`allprojects {`
`17`	`17`	`repositories {`
`18`		`- jcenter()`
	`18`	`+ mavenCentral()`
`19`	`19`	`google()`
`20`	`20`	`}`
`21`	`21`	`}`