Merge branch 'master' into flag-immutable-android-12

azlekov · web-flow · commit c1a99581388f · 2021-11-16T10:39:37.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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)
 
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
-version = 2.0.4
+version = 2.0.5
 android.enableJetifier = true
 android.useAndroidX = true
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -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"
diff --git a/parse/src/main/java/com/parse/ParseUser.java b/parse/src/main/java/com/parse/ParseUser.java
@@ -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);
         }
diff --git a/parse/src/test/java/com/parse/ParseUserTest.java b/parse/src/test/java/com/parse/ParseUserTest.java
@@ -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);
     }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "parse-sdk-android",`
`3`		`- "version": "2.0.4",`
	`3`	`+ "version": "2.0.5",`
`4`	`4`	`"repository": {`
`5`	`5`	`"type": "git",`
`6`	`6`	`"url": "git+https://github.com/parse-community/Parse-SDK-Android.git"`
Original file line number	Diff line number	Diff line change
`@@ -757,15 +757,15 @@ private Map<String, String> getAuthData(String authType) {`
`757`	`757`
`758`	`758`	`/* package */ void putAuthData(String authType, Map<String, String> authData) {`
`759`	`759`	`synchronized (mutex) {`
`760`		`- Map<String, Map<String, String>> newAuthData = getAuthData();`
	`760`	`+ Map<String, Map<String, String>> newAuthData = new HashMap<>(getAuthData());`
`761`	`761`	`newAuthData.put(authType, authData);`
`762`	`762`	`performPut(KEY_AUTH_DATA, newAuthData);`
`763`	`763`	`}`
`764`	`764`	`}`
`765`	`765`
`766`	`766`	`private void removeAuthData(String authType) {`
`767`	`767`	`synchronized (mutex) {`
`768`		`- Map<String, Map<String, String>> newAuthData = getAuthData();`
	`768`	`+ Map<String, Map<String, String>> newAuthData = new HashMap<>(getAuthData());`
`769`	`769`	`newAuthData.remove(authType);`
`770`	`770`	`performPut(KEY_AUTH_DATA, newAuthData);`
`771`	`771`	`}`
Original file line number	Diff line number	Diff line change
`@@ -959,7 +959,7 @@ public void testSaveAsyncWithLazyAndCurrentUser() throws Exception {`
`959`	`959`	`ParseTaskUtils.wait(partialMockUser.saveAsync("sessionToken", Task.<Void>forResult(null)));`
`960`	`960`
`961`	`961`	`// Make sure we clean authData`
`962`		`- assertFalse(partialMockUser.getAuthData().containsKey("facebook"));`
	`962`	`+ assertFalse(partialMockUser.getState().authData().containsKey("facebook"));`
`963`	`963`	`// Make sure we save new currentUser`
`964`	`964`	`verify(currentUserController, times(1)).setAsync(partialMockUser);`
`965`	`965`	`}`