update to 1.0.22

example/lib/main.dart

@@ -192,16 +192,18 @@ class _MyAppState extends State<MyApp> with AutomaticKeepAliveClientMixin {
     final CoreStore coreStore = await initCoreStore();
 
     // Initialize parse
-    Parse().initialize(keyParseApplicationId, keyParseServerUrl,
+    await Parse().initialize(keyParseApplicationId, keyParseServerUrl,
         masterKey: keyParseMasterKey,
         liveQueryUrl: keyParseLiveServerUrl,
         // clientKey: "XXXi3GejX3SIxpDgSbKHHV8uHUUP3QGiPPTlxxxx",
         sessionId: "1212121",
         autoSendSessionId: true,
-        debug: true);
+        debug: true,
+        coreStore: await CoreStoreSharedPrefsImp.getInstance());
     // ParseHTTPClient client = ParseHTTPClient();
 
     liveQuery = LiveQuery();
+
     //parse serve with secure store and desktop support
 
     //    Parse().initialize(keyParseApplicationId, keyParseServerUrl,
@@ -525,7 +527,6 @@ class _MyAppState extends State<MyApp> with AutomaticKeepAliveClientMixin {
     userRepo ??= UserRepository.init(await getDB());
   }
 
-
   /// Available options:
   /// SharedPreferences - Not secure but will work with older versions of SDK - CoreStoreSharedPrefsImpl
   /// Sembast - NoSQL DB - Has security - CoreStoreSembastImpl

example/pubspec.yaml

@@ -8,7 +8,6 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^0.1.2
-  # flutter_stetho: ^0.2.2
   sembast: ^1.13.3+1
   shared_preferences: ^0.5.0
   json_table: ^0.3.0

lib/src/objects/response/parse_response_builder.dart

@@ -123,10 +123,22 @@ class _ParseResponseBuilder {
   /// Handles a response with a single result object
   T _handleSingleResult<T>(
       T object, Map<String, dynamic> map, bool createNewObject) {
-    if (object is ParseObject) {
-      return object..fromJson(map);
-    } else if (createNewObject && object is ParseCloneable) {
+    if (createNewObject && object is ParseCloneable) {
       return object.clone(map);
+    } else if (object is ParseObject) {
+      // Merge unsaved changes and response.
+      final Map<String, dynamic> unsaved = Map<String, dynamic>();
+      unsaved.addAll(object._unsavedChanges);
+      unsaved.forEach((String k, dynamic v) {
+        if (map[k] != null && map[k] != v) {
+          // Changes after save & before response. Keep it.
+          map.remove(k);
+        }
+      });
+      return object
+        ..fromJson(map)
+        .._unsavedChanges.clear()
+        .._unsavedChanges.addAll(unsaved);
     } else {
       return null;
     }