Debug encryption and decryption of files.

Author: Ryan

build.gradle

@@ -6,6 +6,8 @@ buildscript {
         support_version = '25.4.0'
         kotlin_version = '1.1.3'
         anko_version = '0.10.1'
+        bintray_version = '1.7.3'
+        maven_version = '1.5'
     }
     repositories {
         google()
@@ -16,6 +18,9 @@ buildscript {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
 
+        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$bintray_version"
+        classpath "com.github.dcendents:android-maven-gradle-plugin:$maven_version"
+
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

easycrypt/build.gradle

@@ -1,4 +1,29 @@
 apply plugin: 'com.android.library'
+
+ext {
+    bintrayRepo = 'maven'
+    bintrayName = 'easy-crypt'
+
+    publishedGroupId = 'com.pvryan.easycrypt'
+    libraryName = 'EasyCrypt'
+    artifact = 'easy-crypt'
+
+    libraryDescription = 'Library to easily encrypt, decrypt, and hash any type of data.'
+
+    siteUrl = 'https://github.com/ryan652/EasyCrypt'
+    gitUrl = 'https://github.com/ryan652/EasyCrypt.git'
+
+    libraryVersion = '1.0.1-beta'
+
+    developerId = 'ryan652'
+    developerName = 'Priyank Vasa'
+    developerEmail = 'pv.ryan14@gmail.com'
+
+    licenseName = 'The Apache Software License, Version 2.0'
+    licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+    allLicenses = ["Apache-2.0"]
+}
+
 apply plugin: 'kotlin-android'
 
 apply plugin: 'kotlin-android-extensions'
@@ -39,3 +64,6 @@ dependencies {
 repositories {
     mavenCentral()
 }
+
+apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
+apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'

easycrypt/src/main/java/com/pvryan/easycrypt/ECrypt.kt

@@ -24,6 +24,7 @@ import java.io.File
 import java.io.FileInputStream
 import java.io.IOException
 import java.io.InputStream
+import java.security.InvalidKeyException
 import java.security.InvalidParameterException
 import java.security.MessageDigest
 import java.security.SecureRandom
@@ -77,7 +78,9 @@ class ECrypt : AnkoLogger {
     fun <T> encrypt(input: T, password: String, erl: ECryptResultListener,
                     outputFile: File = File(DEF_ENCRYPTED_FILE_PATH)) {
         doAsync {
-
+            if (password.trim().isNullOrBlank()) {
+                erl.onFailure("Password is null or blank.", InvalidKeyException())
+            }
             when (input) {
                 is String -> {
                     encrypt(input.toByteArray(), password, erl, outputFile)
@@ -142,28 +145,33 @@ class ECrypt : AnkoLogger {
                 }
 
                 is InputStream -> {
+                    if (outputFile.exists()) {
+                        if (outputFile.absolutePath != DEF_ENCRYPTED_FILE_PATH) {
+                            erl.onFailure(MSG_OUTPUT_FILE_EXISTS,
+                                    FileAlreadyExistsException(outputFile))
+                            return@doAsync
+                        }
+                        outputFile.delete()
+                    }
+                    outputFile.createNewFile()
+
                     val fos = outputFile.outputStream()
                     var cos = CipherOutputStream(fos, cipher)
-                    try {
-                        if (outputFile.exists()) {
-                            if (outputFile.absolutePath != DEF_ENCRYPTED_FILE_PATH) {
-                                erl.onFailure(MSG_OUTPUT_FILE_EXISTS,
-                                        FileAlreadyExistsException(outputFile))
-                                return@doAsync
-                            }
-                            outputFile.delete()
-                        }
-                        outputFile.createNewFile()
 
+                    try {
                         fos.write(iv)
                         fos.write(salt)
                         cos = CipherOutputStream(fos, cipher)
 
                         val buffer = ByteArray(8192)
-                        var wrote = 0
-                        while ({ wrote = input.read(buffer); wrote }() > 0) {
-                            cos.write(buffer)
-                            erl.onProgress(wrote)
+                        if (input.available() <= buffer.size) {
+                            cos.write(input.readBytes())
+                        } else {
+                            var wrote = 0
+                            while ({ wrote = input.read(buffer); wrote }() > 0) {
+                                cos.write(buffer)
+                                erl.onProgress(wrote)
+                            }
                         }
 
                         erl.onSuccess(outputFile as T)
@@ -185,7 +193,9 @@ class ECrypt : AnkoLogger {
     fun <T> decrypt(input: T, password: String, erl: ECryptResultListener,
                     outputFile: File = File(DEF_DECRYPTED_FILE_PATH)) {
         doAsync {
-
+            if (password.trim().isNullOrBlank()) {
+                erl.onFailure("Password is null or blank.", InvalidKeyException())
+            }
             when (input) {
 
                 is String -> {
@@ -259,19 +269,21 @@ class ECrypt : AnkoLogger {
                 }
 
                 is InputStream -> {
+
+                    if (outputFile.exists()) {
+                        if (outputFile.absolutePath != DEF_DECRYPTED_FILE_PATH) {
+                            erl.onFailure(MSG_OUTPUT_FILE_EXISTS,
+                                    FileAlreadyExistsException(outputFile))
+                            return@doAsync
+                        }
+                        outputFile.delete()
+                    }
+                    outputFile.createNewFile()
+
                     val cis = CipherInputStream(input, cipher)
                     val fos = outputFile.outputStream()
-                    try {
-                        if (outputFile.exists()) {
-                            if (outputFile.absolutePath != DEF_DECRYPTED_FILE_PATH) {
-                                erl.onFailure(MSG_OUTPUT_FILE_EXISTS,
-                                        FileAlreadyExistsException(outputFile))
-                                return@doAsync
-                            }
-                            outputFile.delete()
-                        }
-                        outputFile.createNewFile()
 
+                    try {
                         val iv = ByteArray(cipher.blockSize)
                         val salt = ByteArray(SALT_BYTES_LENGTH)
 
@@ -292,10 +304,14 @@ class ECrypt : AnkoLogger {
                         cipher.init(Cipher.DECRYPT_MODE, key, ivParams)
 
                         val buffer = ByteArray(8192)
-                        var wrote = 0
-                        while ({ wrote = cis.read(buffer); wrote }() > 0) {
-                            fos.write(buffer)
-                            erl.onProgress(wrote)
+                        if (cis.available() <= buffer.size) {
+                            fos.write(cis.readBytes())
+                        } else {
+                            var wrote = 0
+                            while ({ wrote = cis.read(buffer); wrote }() > 0) {
+                                fos.write(buffer)
+                                erl.onProgress(wrote)
+                            }
                         }
 
                         erl.onSuccess(outputFile as T)

easycrypt/src/main/java/com/pvryan/easycrypt/extensions/DataTypeExtensions.kt

@@ -17,6 +17,7 @@ package com.pvryan.easycrypt.extensions
 
 import android.util.Base64
 import com.pvryan.easycrypt.ECrypt
+import java.security.spec.InvalidKeySpecException
 import java.util.regex.Pattern
 import javax.crypto.SecretKeyFactory
 import javax.crypto.spec.PBEKeySpec
@@ -59,6 +60,7 @@ fun String.hexToByteArray(): ByteArray {
     return data
 }
 
+@Throws(InvalidKeySpecException::class)
 fun ECrypt.getKey(password: String = String(), salt: ByteArray): SecretKeySpec {
 
     val pbeKeySpec: PBEKeySpec = PBEKeySpec(