ADD BadPaddingException if restore pw is wrong #13

Author: rafi0101

README.md

@@ -3,6 +3,7 @@
 
 ![Build](https://github.com/rafi0101/Android-Room-Database-Backup/workflows/Android%20CI/badge.svg)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/de.raphaelebner/roomdatabasebackup/badge.svg)](https://maven-badges.herokuapp.com/maven-central/de.raphaelebner/roomdatabasebackup)
+[![Room Version](https://img.shields.io/badge/room_version-2.4.0-orange)](https://developer.android.com/jetpack/androidx/releases/room#version_240_3)
 [![API](https://img.shields.io/badge/API-21%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=21)
 ![Language](https://img.shields.io/badge/language-Kotlin-orange.svg)
 [![PRWelcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/rafi0101/Android-Room-Database-Backup/pulls)
@@ -63,7 +64,8 @@ implementation 'com.github.rafi0101:Android-Room-Database-Backup:1.0.0-beta09'
 ### New:
 
 From now on the Android-Room-Database-Backup library is pushed
-to [Maven Central](https://search.maven.org/artifact/de.raphaelebner/roomdatabasebackup/).
+to [Maven Central](https://search.maven.org/artifact/de.raphaelebner/roomdatabasebackup/).  
+Add the dependency for `Android-Room-Database-Backup ` to your app-level `build.gradle` file.
 
 ```groovy
 implementation 'de.raphaelebner:roomdatabasebackup:1.0.0-beta09'
@@ -95,7 +97,7 @@ Usage
     .database(*YourDatabase*.getInstance(this))
     ```
 
-e.g. [`YourDatabase.kt`](app/src/main/java/com/ebner/roomdatabasebackup/sample/database/main/FruitDatabase.kt)
+e.g. [`YourDatabase.kt`](app/src/main/java/de/raphaelebner/roomdatabasebackup/sample/database/main/FruitDatabase.kt)
 
 **Optional**
 

app/build.gradle

@@ -58,7 +58,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     //ROOM SQLite
-    def room_version = "2.3.0"
+    def room_version = "2.4.0"
 
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"

build.gradle

@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.6.0'
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:7.0.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -16,7 +16,7 @@ buildscript {
 
 plugins {
     id('io.github.gradle-nexus.publish-plugin') version "1.1.0"
-    id("org.jetbrains.dokka") version "1.6.0"
+    id("org.jetbrains.dokka") version "1.6.10"
 }
 
 apply from: "${rootDir}/scripts/publish-root.gradle"

core/build.gradle

@@ -26,9 +26,17 @@ android {
     }
 
     buildTypes {
+        debug{
+            buildConfigField("long", "VERSION_CODE", "${defaultConfig.versionCode}")
+            buildConfigField("String","VERSION_NAME","\"${defaultConfig.versionName}\"")
+
+        }
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            buildConfigField("long", "VERSION_CODE", "${defaultConfig.versionCode}")
+            buildConfigField("String","VERSION_NAME","\"${defaultConfig.versionName}\"")
+
         }
     }
 
@@ -59,7 +67,7 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     //ROOM SQLite
-    def room_version = "2.3.0"
+    def room_version = "2.4.0"
 
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"

core/src/main/java/de/raphaelebner/roomdatabasebackup/core/RoomBackup.kt

@@ -22,6 +22,7 @@ import org.apache.commons.io.comparator.LastModifiedFileComparator
 import java.io.*
 import java.text.SimpleDateFormat
 import java.util.*
+import javax.crypto.BadPaddingException
 
 
 /**
@@ -371,7 +372,7 @@ class RoomBackup(var context: Context) : FragmentActivity() {
         //Close the database
         roomDatabase!!.close()
         if (backupIsEncrypted) {
-            val encryptedBytes = encryptBackup()
+            val encryptedBytes = encryptBackup() ?: return
             val bos = BufferedOutputStream(FileOutputStream(destination, false))
             bos.write(encryptedBytes)
             bos.flush()
@@ -400,7 +401,7 @@ class RoomBackup(var context: Context) : FragmentActivity() {
         //Close the database
         roomDatabase!!.close()
         if (backupIsEncrypted) {
-            val encryptedBytes = encryptBackup()
+            val encryptedBytes = encryptBackup() ?: return
             destination.write(encryptedBytes)
         } else {
             //Copy current database to save location (/files dir)
@@ -536,7 +537,7 @@ class RoomBackup(var context: Context) : FragmentActivity() {
         val fileExtension = source.extension
         if (backupIsEncrypted) {
             copy(source, TEMP_BACKUP_FILE)
-            val decryptedBytes = decryptBackup()
+            val decryptedBytes = decryptBackup() ?: return
             val bos = BufferedOutputStream(FileOutputStream(DATABASE_FILE, false))
             bos.write(decryptedBytes)
             bos.flush()
@@ -561,8 +562,6 @@ class RoomBackup(var context: Context) : FragmentActivity() {
      * @param source InputStream
      */
     private fun doRestore(source: InputStream) {
-        //Close the database
-        roomDatabase!!.close()
         if (backupIsEncrypted) {
             //Save inputstream to temp file
             source.use { input ->
@@ -571,12 +570,19 @@ class RoomBackup(var context: Context) : FragmentActivity() {
                 }
             }
             //Decrypt tempfile and write to database file
-            val decryptedBytes = decryptBackup()
+            val decryptedBytes = decryptBackup() ?: return
+
+            //Close the database if decryption is succesfull
+            roomDatabase!!.close()
+
             val bos = BufferedOutputStream(FileOutputStream(DATABASE_FILE, false))
             bos.write(decryptedBytes)
             bos.flush()
             bos.close()
         } else {
+            //Close the database
+            roomDatabase!!.close()
+
             //Copy back database and replace current database
             source.use { input ->
                 DATABASE_FILE.outputStream().use { output ->
@@ -621,18 +627,28 @@ class RoomBackup(var context: Context) : FragmentActivity() {
             val fileData = encryptDecryptBackup.readFile(TEMP_BACKUP_FILE)
 
             val aesEncryptionManager = AESEncryptionManager()
-            val decryptedBytes = aesEncryptionManager.decryptData(sharedPreferences, encryptPassword, fileData)
+            val decryptedBytes =
+                aesEncryptionManager.decryptData(sharedPreferences, encryptPassword, fileData)
 
             //Delete tem file
             TEMP_BACKUP_FILE.delete()
 
             return decryptedBytes
 
+        } catch (e: BadPaddingException) {
+            if (enableLogDebug) Log.d(TAG, "error during decryption (wrong password): ${e.message}")
+            onCompleteListener?.onComplete(
+                false,
+                "error during decryption (wrong password) see Log for more details (if enabled)"
+            )
+            return null
         } catch (e: Exception) {
             if (enableLogDebug) Log.d(TAG, "error during decryption: ${e.message}")
-            onCompleteListener?.onComplete(false, "error during decryption (maybe wrong password) see Log for more details (if enabled)")
+            onCompleteListener?.onComplete(
+                false,
+                "error during decryption see Log for more details (if enabled)"
+            )
             return null
-            //   throw Exception("error during decryption: $e")
         }
     }