From 6e887fa7c09c67bb4a8b849d1603d02286af6c6b Mon Sep 17 00:00:00 2001 From: Geoffrey Goh Date: Tue, 2 Feb 2016 14:42:30 -0800 Subject: [PATCH 1/5] Revert "Disable metrics reporting in debug mode" --- CodePush.m | 13 ++----------- android/app/build.gradle | 6 +++--- .../java/com/microsoft/codepush/react/CodePush.java | 5 ----- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/CodePush.m b/CodePush.m index a7aa7b3..2059fac 100644 --- a/CodePush.m +++ b/CodePush.m @@ -512,15 +512,6 @@ RCT_EXPORT_METHOD(notifyApplicationReady:(RCTPromiseResolveBlock)resolve RCT_EXPORT_METHOD(getNewStatusReport:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) { -#ifdef DEBUG - // Do not report metrics if running in debug mode. - resolve(nil); -#else - if ([_bridge.bundleURL.scheme hasPrefix:@"http"]) { - // Do not report metrics if running bundle from packager. - resolve(nil); - return; - } dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ if (needToReportRollback) { @@ -541,7 +532,8 @@ RCT_EXPORT_METHOD(getNewStatusReport:(RCTPromiseResolveBlock)resolve resolve([CodePushTelemetryManager getUpdateReport:currentPackage]); return; } - } else if (isRunningBinaryVersion) { + } else if (isRunningBinaryVersion || [_bridge.bundleURL.scheme hasPrefix:@"http"]) { + // Check if the current appVersion has been reported. NSString *appVersion = [[CodePushConfig current] appVersion]; resolve([CodePushTelemetryManager getBinaryUpdateReport:appVersion]); return; @@ -549,7 +541,6 @@ RCT_EXPORT_METHOD(getNewStatusReport:(RCTPromiseResolveBlock)resolve resolve(nil); }); -#endif } /* diff --git a/android/app/build.gradle b/android/app/build.gradle index 6ba6398..3dc2a4e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -22,7 +22,7 @@ android { } dependencies { - compile fileTree(dir: "libs", include: ["*.jar"]) - compile "com.android.support:appcompat-v7:23.0.1" - compile "com.facebook.react:react-native:0.19.+" + compile fileTree(dir: 'libs', include: ['*.jar']) + compile 'com.android.support:appcompat-v7:23.0.0' + compile 'com.facebook.react:react-native:0.15.1' } \ No newline at end of file diff --git a/android/app/src/main/java/com/microsoft/codepush/react/CodePush.java b/android/app/src/main/java/com/microsoft/codepush/react/CodePush.java index f84102c..a247724 100644 --- a/android/app/src/main/java/com/microsoft/codepush/react/CodePush.java +++ b/android/app/src/main/java/com/microsoft/codepush/react/CodePush.java @@ -426,11 +426,6 @@ public class CodePush { @ReactMethod public void getNewStatusReport(final Promise promise) { - if (isDebugMode) { - // Do not report metrics if running in debug mode. - promise.resolve(""); - return; - } AsyncTask asyncTask = new AsyncTask() { @Override From b1babeb510e695e881f4e0624275fbb64c98d455 Mon Sep 17 00:00:00 2001 From: Geoffrey Goh Date: Tue, 2 Feb 2016 15:15:17 -0800 Subject: [PATCH 2/5] disable-metrics-in-debug --- CodePush.js | 5 +++++ CodePush.m | 6 +++++- android/app/build.gradle | 6 +++--- package-mixins.js | 3 ++- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/CodePush.js b/CodePush.js index b95296a..79821f9 100644 --- a/CodePush.js +++ b/CodePush.js @@ -137,6 +137,11 @@ function log(message) { async function notifyApplicationReady() { await NativeCodePush.notifyApplicationReady(); + if (__DEV__) { + // Don't report metrics if in DEV mode. + return; + } + const statusReport = await NativeCodePush.getNewStatusReport(); if (statusReport) { const config = await getConfiguration(); diff --git a/CodePush.m b/CodePush.m index 2059fac..5ede292 100644 --- a/CodePush.m +++ b/CodePush.m @@ -512,6 +512,10 @@ RCT_EXPORT_METHOD(notifyApplicationReady:(RCTPromiseResolveBlock)resolve RCT_EXPORT_METHOD(getNewStatusReport:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) { + if ([_bridge.bundleURL.scheme hasPrefix:@"http"]) { + resolve(nil); + return; + } dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ if (needToReportRollback) { @@ -532,7 +536,7 @@ RCT_EXPORT_METHOD(getNewStatusReport:(RCTPromiseResolveBlock)resolve resolve([CodePushTelemetryManager getUpdateReport:currentPackage]); return; } - } else if (isRunningBinaryVersion || [_bridge.bundleURL.scheme hasPrefix:@"http"]) { + } else if (isRunningBinaryVersion) { // Check if the current appVersion has been reported. NSString *appVersion = [[CodePushConfig current] appVersion]; resolve([CodePushTelemetryManager getBinaryUpdateReport:appVersion]); diff --git a/android/app/build.gradle b/android/app/build.gradle index 3dc2a4e..6ba6398 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -22,7 +22,7 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:23.0.0' - compile 'com.facebook.react:react-native:0.15.1' + compile fileTree(dir: "libs", include: ["*.jar"]) + compile "com.android.support:appcompat-v7:23.0.1" + compile "com.facebook.react:react-native:0.19.+" } \ No newline at end of file diff --git a/package-mixins.js b/package-mixins.js index 6078bee..fb68ead 100644 --- a/package-mixins.js +++ b/package-mixins.js @@ -25,7 +25,8 @@ module.exports = (NativeCodePush) => { // so that the client knows what the current package version is. try { const downloadedPackage = await NativeCodePush.downloadUpdate(this); - reportStatusDownload && reportStatusDownload(this); + // Don't report metrics if in DEV mode. + !__DEV__ && reportStatusDownload && reportStatusDownload(this); return { ...downloadedPackage, ...local }; } finally { downloadProgressSubscription && downloadProgressSubscription.remove(); From 3e375c84ad3213a7216a4b8413f73f951a72b299 Mon Sep 17 00:00:00 2001 From: Geoffrey Goh Date: Tue, 2 Feb 2016 15:16:55 -0800 Subject: [PATCH 3/5] reenable comment --- CodePush.m | 1 + 1 file changed, 1 insertion(+) diff --git a/CodePush.m b/CodePush.m index 5ede292..cd33d7e 100644 --- a/CodePush.m +++ b/CodePush.m @@ -513,6 +513,7 @@ RCT_EXPORT_METHOD(getNewStatusReport:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) { if ([_bridge.bundleURL.scheme hasPrefix:@"http"]) { + // Do not report metrics if running bundle from packager. resolve(nil); return; } From ee4cfcc1c11da4a9c439d01dc2421b5705ad732b Mon Sep 17 00:00:00 2001 From: Geoffrey Goh Date: Tue, 2 Feb 2016 15:17:20 -0800 Subject: [PATCH 4/5] remove comment --- CodePush.m | 1 - 1 file changed, 1 deletion(-) diff --git a/CodePush.m b/CodePush.m index cd33d7e..e97298d 100644 --- a/CodePush.m +++ b/CodePush.m @@ -538,7 +538,6 @@ RCT_EXPORT_METHOD(getNewStatusReport:(RCTPromiseResolveBlock)resolve return; } } else if (isRunningBinaryVersion) { - // Check if the current appVersion has been reported. NSString *appVersion = [[CodePushConfig current] appVersion]; resolve([CodePushTelemetryManager getBinaryUpdateReport:appVersion]); return; From b95519a0b6152a182af279012275a2d9c0e27238 Mon Sep 17 00:00:00 2001 From: Geoffrey Goh Date: Tue, 2 Feb 2016 16:31:14 -0800 Subject: [PATCH 5/5] bump package.json versions --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d626df2..7c1f696 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-code-push", - "version": "1.6.0-beta", + "version": "1.7.0-beta", "description": "React Native plugin for the CodePush service", "main": "CodePush.js", "homepage": "https://microsoft.github.io/code-push", @@ -20,6 +20,6 @@ "semver": "^5.1.0" }, "devDependencies": { - "react-native": "0.15.0" + "react-native": "0.19.0" } }