Fixing reading data during manual conflict resolution with Snapshots.

claywilkinson · claywilkinson · commit 476c4bde6094 · 2018-01-18T10:09:11.000-08:00
Change-Id: I9f76d4363748a793a4227eafcd5b089a6fc39d8e
diff --git a/samples-android/CollectAllTheStarsNative/src/main/cpp/CollectAllTheStarsNativeActivity.cpp b/samples-android/CollectAllTheStarsNative/src/main/cpp/CollectAllTheStarsNativeActivity.cpp
@@ -197,7 +197,7 @@ Engine::ResolveConflicts(gpg::SnapshotManager::OpenResponse const &originalRespo
       manager.OpenBlocking(originalResponse.conflict_original.FileName(),
                            gpg::SnapshotConflictPolicy::MANUAL);
   gpg::SnapshotManager::ReadResponse responseReadBase =
-      manager.ReadBlocking(responseBase.data);
+      manager.ReadBlocking(responseBase.conflict_original);
   ParseSnapshotData(responseReadBase.data);
 
   // Temporary store data,
@@ -211,7 +211,7 @@ Engine::ResolveConflicts(gpg::SnapshotManager::OpenResponse const &originalRespo
       manager.OpenBlocking(originalResponse.conflict_unmerged.FileName(),
                            gpg::SnapshotConflictPolicy::MANUAL);
   gpg::SnapshotManager::ReadResponse responseReadRemote =
-      manager.ReadBlocking(responseRemote.data);
+      manager.ReadBlocking(responseRemote.conflict_unmerged);
   ParseSnapshotData(responseReadRemote.data);
 
   // Merging them
