Added fastlane

Added database version to backup file

app/build.gradle

@@ -16,8 +16,8 @@ android {
         applicationId "com.yogeshpaliyal.keypass"
         minSdkVersion 22
         targetSdkVersion 30
-        versionCode 2
-        versionName "1.1"
+        versionCode 3
+        versionName "1.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/yogeshpaliyal/keypass/data/BackupData.kt

@@ -0,0 +1,20 @@
+package com.yogeshpaliyal.keypass.data
+
+import com.google.gson.annotations.Expose
+import com.google.gson.annotations.SerializedName
+
+
+/*
+* @author Yogesh Paliyal
+* techpaliyal@gmail.com
+* https://techpaliyal.com
+* created on 23-02-2021 20:48
+*/
+data class BackupData(
+    @SerializedName("version")
+    @Expose
+    val version : Int,
+    @SerializedName("data")
+    @Expose
+    val data : List<AccountModel> ) {
+}

app/src/main/java/com/yogeshpaliyal/keypass/db_helper/DbBackupRestore.kt

@@ -8,6 +8,7 @@ import androidx.room.withTransaction
 import com.google.gson.Gson
 import com.yogeshpaliyal.keypass.AppDatabase
 import com.yogeshpaliyal.keypass.data.AccountModel
+import com.yogeshpaliyal.keypass.data.BackupData
 import com.yogeshpaliyal.keypass.utils.getOrCreateBackupKey
 import com.yogeshpaliyal.keypass.utils.logD
 import kotlinx.coroutines.Dispatchers
@@ -29,8 +30,8 @@ import javax.crypto.SecretKey
 suspend fun AppDatabase.createBackup(key: String,contentResolver : ContentResolver,fileUri: Uri?) = withContext(Dispatchers.IO){
  fileUri ?: return@withContext false
     val data = getDao().getAllAccounts().first()
-    val json = Gson().toJson(data)
 
+    val json = Gson().toJson(BackupData(this@createBackup.openHelper.readableDatabase.version, data))
     val fileStream = contentResolver.openOutputStream(fileUri)
     EncryptionHelper.doCryptoEncrypt(key,json, fileStream)
 
@@ -47,12 +48,12 @@ suspend fun AppDatabase.restoreBackup(key: String,contentResolver : ContentResol
         e.printStackTrace()
         return@withContext false
     }
-    val data = Gson().fromJson(restoredFile, Array<AccountModel>::class.java).toList()
-    data.forEach {
+    val data = Gson().fromJson(restoredFile, BackupData::class.java)
+    data.data.forEach {
         it.id = null
     }
     withTransaction {
-        getDao().insertOrUpdateAccount(data.toList())
+        getDao().insertOrUpdateAccount(data.data)
     }
     return@withContext true
 }

app/src/main/java/com/yogeshpaliyal/keypass/ui/settings/MySettingsFragment.kt

@@ -173,7 +173,8 @@ class MySettingsFragment : PreferenceFragmentCompat() {
         )
 
         lifecycleScope.launch {
-            context?.contentResolver?.let { AppDatabase.getInstance().createBackup(keyPair.second,
+            context?.contentResolver?.let {
+                AppDatabase.getInstance().createBackup(keyPair.second,
                 it,
                 tempFile?.uri
             )

app/src/main/java/com/yogeshpaliyal/keypass/utils/ByteUtil.java

@@ -1,20 +0,0 @@
-package com.yogeshpaliyal.keypass.utils;
-
-/*
- * @author Yogesh Paliyal
- * techpaliyal@gmail.com
- * https://techpaliyal.com
- * created on 21-02-2021 13:36
- */
-public class ByteUtil {
-    public static long byteArray5ToLong(byte[] bytes, int offset) {
-        return
-                ((bytes[offset]     & 0xffL) << 32) |
-                        ((bytes[offset + 1] & 0xffL) << 24) |
-                        ((bytes[offset + 2] & 0xffL) << 16) |
-                        ((bytes[offset + 3] & 0xffL) << 8) |
-                        ((bytes[offset + 4] & 0xffL));
-    }
-}
-
-

fastlane/metadata/android/en-US/changelogs/2.txt

@@ -0,0 +1,2 @@
+New Features*
+Backup & Restore your credentials (Fully Encrypted)

fastlane/metadata/android/en-US/changelogs/3.txt

@@ -0,0 +1 @@
+Added database version to backup file

fastlane/metadata/android/en-US/full_description.txt

@@ -0,0 +1,8 @@
+The modern password manager does not store your credentials on servers so your passwords are in your hands, no need to worry.
+
+1. Fully Offline
+2. Without Ads
+3. Open source (you can view source code)
+4. Backup & Restore your credentials
+
+https://github.com/yogeshpaliyal/KeyPass

fastlane/metadata/android/en-US/short_description.txt

@@ -0,0 +1 @@
+Offline, Secure, Private

fastlane/metadata/android/en-US/title.txt

@@ -0,0 +1 @@
+KeyPass

gradle/wrapper/gradle-wrapper.properties

@@ -4,3 +4,4 @@ distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionSha256Sum=c9910513d0eed63cd8f5c7fec4cb4a05731144770104a0871234a4edc3ba3cef

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or 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
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$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=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -66,6 +82,7 @@ esac
 
 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
@@ -109,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -138,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     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" ;;
+        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
 
@@ -159,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@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
@@ -13,8 +29,11 @@ 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=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
@@ -65,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 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%