Merge pull request #83 from SUPLA/develop

v2.3.15
SUPLA · Jul 8, 2019 · 6e66904 · 6e66904
2 parents fbee73e + 6c69a27
commit 6e66904
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.supla.android"
         minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
-        versionCode 68
-        versionName "2.3.14"
+        versionCode 69
+        versionName "2.3.15"
 
         sourceSets.main {
             jniLibs.srcDir 'src/main/libs'

diff --git a/app/src/main/java/org/supla/android/Encryption.java b/app/src/main/java/org/supla/android/Encryption.java
@@ -34,14 +34,17 @@ public class Encryption {
     private static SecretKey generateKey(String password)
             throws NoSuchAlgorithmException, InvalidKeySpecException
     {
-        password = password.substring(0, 32);
-        String alignment = "";
+        if (password == null) {
+            password = "";
+        }
 
+        String alignment = "";
         for(int a=0;a<32-password.length();a++) {
             alignment+="0";
         }
 
         password+=alignment;
+        password = password.substring(0, 32);
 
         return new SecretKeySpec(password.getBytes(), "AES");
     }