Skip to content

Commit

Permalink
Merge branch 'master' into flag-immutable-android-12
Browse files Browse the repository at this point in the history
  • Loading branch information
azlekov committed Nov 16, 2021
2 parents 53a9d09 + 8d9691e commit c1a9958
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 6 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## [2.0.5](https://github.com/parse-community/Parse-SDK-Android/compare/2.0.4...2.0.5) (2021-11-10)


### Bug Fixes

* failed signup attempt with anonymous ParseUser leaves it in inconsistent state ([#1136](https://github.com/parse-community/Parse-SDK-Android/issues/1136)) ([ac6d9e0](https://github.com/parse-community/Parse-SDK-Android/commit/ac6d9e0734d1ea9c0bc26ddd7bfa8dea21a8c693))

## [2.0.4](https://github.com/parse-community/Parse-SDK-Android/compare/2.0.3...2.0.4) (2021-11-03)


Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version = 2.0.4
version = 2.0.5
android.enableJetifier = true
android.useAndroidX = true
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "parse-sdk-android",
"version": "2.0.4",
"version": "2.0.5",
"repository": {
"type": "git",
"url": "git+https://github.com/parse-community/Parse-SDK-Android.git"
Expand Down
4 changes: 2 additions & 2 deletions parse/src/main/java/com/parse/ParseUser.java
Original file line number Diff line number Diff line change
Expand Up @@ -757,15 +757,15 @@ private Map<String, String> getAuthData(String authType) {

/* package */ void putAuthData(String authType, Map<String, String> authData) {
synchronized (mutex) {
Map<String, Map<String, String>> newAuthData = getAuthData();
Map<String, Map<String, String>> newAuthData = new HashMap<>(getAuthData());
newAuthData.put(authType, authData);
performPut(KEY_AUTH_DATA, newAuthData);
}
}

private void removeAuthData(String authType) {
synchronized (mutex) {
Map<String, Map<String, String>> newAuthData = getAuthData();
Map<String, Map<String, String>> newAuthData = new HashMap<>(getAuthData());
newAuthData.remove(authType);
performPut(KEY_AUTH_DATA, newAuthData);
}
Expand Down
2 changes: 1 addition & 1 deletion parse/src/test/java/com/parse/ParseUserTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -959,7 +959,7 @@ public void testSaveAsyncWithLazyAndCurrentUser() throws Exception {
ParseTaskUtils.wait(partialMockUser.saveAsync("sessionToken", Task.<Void>forResult(null)));

// Make sure we clean authData
assertFalse(partialMockUser.getAuthData().containsKey("facebook"));
assertFalse(partialMockUser.getState().authData().containsKey("facebook"));
// Make sure we save new currentUser
verify(currentUserController, times(1)).setAsync(partialMockUser);
}
Expand Down

0 comments on commit c1a9958

Please sign in to comment.