Merge pull request #377 from convoyinc/nevir/get-metadata-local-methods

lostintangent · web-flow · commit c861d0c9bdbf · 2016-06-14T20:45:13.000-07:00
Include local package mixins when returning packages from getUpdateMetadata()
diff --git a/CodePush.js b/CodePush.js
@@ -106,8 +106,9 @@ async function getCurrentPackage() {
 }
 
 async function getUpdateMetadata(updateState) {
-  const updateMetadata = await NativeCodePush.getUpdateMetadata(updateState || CodePush.UpdateState.RUNNING);
+  let updateMetadata = await NativeCodePush.getUpdateMetadata(updateState || CodePush.UpdateState.RUNNING);
   if (updateMetadata) {
+    updateMetadata = {...PackageMixins.local, ...updateMetadata};
     updateMetadata.failedInstall = await NativeCodePush.isFailedUpdate(updateMetadata.packageHash);
     updateMetadata.isFirstRun = await NativeCodePush.isFirstRun(updateMetadata.packageHash);
   }

Original file line number	Diff line number	Diff line change
`@@ -106,8 +106,9 @@ async function getCurrentPackage() {`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`async function getUpdateMetadata(updateState) {`
`109`		`- const updateMetadata = await NativeCodePush.getUpdateMetadata(updateState \|\| CodePush.UpdateState.RUNNING);`
	`109`	`+ let updateMetadata = await NativeCodePush.getUpdateMetadata(updateState \|\| CodePush.UpdateState.RUNNING);`
`110`	`110`	`if (updateMetadata) {`
	`111`	`+ updateMetadata = {...PackageMixins.local, ...updateMetadata};`
`111`	`112`	`updateMetadata.failedInstall = await NativeCodePush.isFailedUpdate(updateMetadata.packageHash);`
`112`	`113`	`updateMetadata.isFirstRun = await NativeCodePush.isFirstRun(updateMetadata.packageHash);`
`113`	`114`	`}`