Merge branch 'master' of https://github.com/senseobservationsystems/sense-android-library into develop

Author: ted

CHANGELOG.md

@@ -1,3 +1,4 @@
+
 ## v3.4-rc2 (2015-03-10)
 
 ### Fixed
@@ -14,7 +15,20 @@
 ### Dependency
 * Google Play services client library 
 
-## v3.3.3 (2015-04-02)
+
+## v3.3.5 (2015-03-30)
+
+### Fixed
+* Fix bug in register with preferences encryption enable
+
+
+## v3.3.4 (2015-03-10)
+
+### Fixed
+* Fix bug with implicit intent in lollipop 
+
+
+## v3.3.3 (2015-03-04)
 
 ### Fixed
 * Fix setPrefInt in SenseServiceStub to use putInt instead of putFloat

sense-android-library/AndroidManifest.xml

@@ -5,4 +5,4 @@
     android:versionName="3.4">
     <!-- <uses-sdk -->
     <uses-sdk android:minSdkVersion="7"/>
-</manifest>
+</manifest>

sense-android-library/src/nl/sense_os/service/SenseService.java

@@ -526,15 +526,18 @@ synchronized int register(String username, String password, String email, String
         boolean encrypt_credential = getSharedPreferences(SensePrefs.MAIN_PREFS, MODE_PRIVATE)
                                          .getBoolean(Advanced.ENCRYPT_CREDENTIAL, false);
 
+        String encryptedUsername = username;
+        String encryptedPassword = password;
+        
         if (encrypt_credential) {
             EncryptionHelper encryptor = new EncryptionHelper(this);
-            username = encryptor.encrypt(username);
-            password = encryptor.encrypt(password);
+            encryptedUsername = encryptor.encrypt(username);
+            encryptedPassword = encryptor.encrypt(password);
         }
 
         // save new username and password in the preferences
-        authEditor.putString(Auth.LOGIN_USERNAME, username);
-        authEditor.putString(Auth.LOGIN_PASS, password);
+        authEditor.putString(Auth.LOGIN_USERNAME, encryptedUsername);
+        authEditor.putString(Auth.LOGIN_PASS, encryptedPassword);
         authEditor.commit();
 
         // try to register