Updating saved game sample to work with C++ SDK v1.3.

hak · hak · commit ef2974ebdee9 · 2014-11-12T11:48:29.000-08:00
There has been a member name change in gpg::SnapshotManager::OpenResponse.

Bug:b/18355964
Change-Id: Icfc1809996fa8dd6da5db7b0d4f2c7f2a4b14c1b
Tested: In N5
diff --git a/samples-android/CollectAllTheStarsNative/jni/CollectAllTheStarsNativeActivity.cpp b/samples-android/CollectAllTheStarsNative/jni/CollectAllTheStarsNativeActivity.cpp
@@ -194,7 +194,7 @@ Engine::ResolveConflicts(gpg::SnapshotManager::OpenResponse const &openResponse,
   //
   gpg::SnapshotManager &manager = service_->Snapshots();
   gpg::SnapshotManager::OpenResponse responseBase =
-      manager.OpenBlocking(openResponse.conflict_base.FileName(),
+      manager.OpenBlocking(openResponse.conflict_original.FileName(),
                            gpg::SnapshotConflictPolicy::MANUAL);
   gpg::SnapshotManager::ReadResponse responseReadBase =
       manager.ReadBlocking(responseBase.data);
@@ -208,7 +208,7 @@ Engine::ResolveConflicts(gpg::SnapshotManager::OpenResponse const &openResponse,
     }
 
   gpg::SnapshotManager::OpenResponse responseRemote =
-      manager.OpenBlocking(openResponse.conflict_remote.FileName(),
+      manager.OpenBlocking(openResponse.conflict_unmerged.FileName(),
                            gpg::SnapshotConflictPolicy::MANUAL);
   gpg::SnapshotManager::ReadResponse responseReadRemote =
       manager.ReadBlocking(responseRemote.data);
