diff options
| author | Kevin T. Berstene <kberstene@gmail.com> | 2019-04-01 14:30:43 -0400 |
|---|---|---|
| committer | Kevin T. Berstene <kberstene@gmail.com> | 2019-04-01 14:30:43 -0400 |
| commit | 0e5c95e5cb6f7db5cc1c3ae711f622378d8ef786 (patch) | |
| tree | 252846940f1e75a34b8da511d1975c68fa00c1f1 /app/src/main/java/github/daneren2005/dsub/util/Util.java | |
| parent | 2b26df335ccff17e3970ac94f4c0abfbd6898a47 (diff) | |
| download | dsub-0e5c95e5cb6f7db5cc1c3ae711f622378d8ef786.tar.gz dsub-0e5c95e5cb6f7db5cc1c3ae711f622378d8ef786.tar.bz2 dsub-0e5c95e5cb6f7db5cc1c3ae711f622378d8ef786.zip | |
Added password encryption for SDK 23 and higher
Diffstat (limited to 'app/src/main/java/github/daneren2005/dsub/util/Util.java')
| -rw-r--r-- | app/src/main/java/github/daneren2005/dsub/util/Util.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/src/main/java/github/daneren2005/dsub/util/Util.java b/app/src/main/java/github/daneren2005/dsub/util/Util.java index 78f3e2d6..791fea91 100644 --- a/app/src/main/java/github/daneren2005/dsub/util/Util.java +++ b/app/src/main/java/github/daneren2005/dsub/util/Util.java @@ -199,6 +199,7 @@ public final class Util { String serverUrl = prefs.getString(Constants.PREFERENCES_KEY_SERVER_URL + newInstance, null); String userName = prefs.getString(Constants.PREFERENCES_KEY_USERNAME + newInstance, null); String password = prefs.getString(Constants.PREFERENCES_KEY_PASSWORD + newInstance, null); + if ((password != null) && (prefs.getBoolean(Constants.PREFERENCES_KEY_ENCRYPTED_PASSWORD + instance, false))) password = KeyStoreUtil.decrypt(password); String musicFolderId = prefs.getString(Constants.PREFERENCES_KEY_MUSIC_FOLDER_ID + newInstance, null); // Store the +1 server details in the to be deleted instance @@ -364,6 +365,7 @@ public final class Util { String username = prefs.getString(Constants.PREFERENCES_KEY_USERNAME + instance, null); String password = prefs.getString(Constants.PREFERENCES_KEY_PASSWORD + instance, null); + if ((password != null) && (prefs.getBoolean(Constants.PREFERENCES_KEY_ENCRYPTED_PASSWORD + instance, false))) password = KeyStoreUtil.decrypt(password); builder.append(serverUrl); if (builder.charAt(builder.length() - 1) != '/') { |