From 476c4bde6094f83b77cd4f6021cbc2b0a56c8a6a Mon Sep 17 00:00:00 2001 From: Clayton Wilkinson Date: Thu, 18 Jan 2018 10:08:26 -0800 Subject: [PATCH] Fixing reading data during manual conflict resolution with Snapshots. Change-Id: I9f76d4363748a793a4227eafcd5b089a6fc39d8e --- .../src/main/cpp/CollectAllTheStarsNativeActivity.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples-android/CollectAllTheStarsNative/src/main/cpp/CollectAllTheStarsNativeActivity.cpp b/samples-android/CollectAllTheStarsNative/src/main/cpp/CollectAllTheStarsNativeActivity.cpp index 5ce85f8..ef75e7a 100644 --- 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