From 82bcb24fc22e7f10ec7699efa543afeec4d2043e Mon Sep 17 00:00:00 2001 From: axel-op <49279289+axel-op@users.noreply.github.com> Date: Wed, 17 Jul 2019 18:40:31 +0200 Subject: [PATCH 1/3] Fix invokeMethod formatting that caused a bug with Dart code obfuscation --- packages/firebase_performance/android/.project | 17 +++++++++++++++++ .../.settings/org.eclipse.buildship.core.prefs | 13 +++++++++++++ .../example/android/.project | 17 +++++++++++++++++ .../.settings/org.eclipse.buildship.core.prefs | 13 +++++++++++++ .../lib/src/firebase_performance.dart | 8 ++++---- .../lib/src/http_metric.dart | 12 ++++++------ .../lib/src/performance_attributes.dart | 6 +++--- .../firebase_performance/lib/src/trace.dart | 10 +++++----- 8 files changed, 78 insertions(+), 18 deletions(-) create mode 100644 packages/firebase_performance/android/.project create mode 100644 packages/firebase_performance/android/.settings/org.eclipse.buildship.core.prefs create mode 100644 packages/firebase_performance/example/android/.project create mode 100644 packages/firebase_performance/example/android/.settings/org.eclipse.buildship.core.prefs diff --git a/packages/firebase_performance/android/.project b/packages/firebase_performance/android/.project new file mode 100644 index 000000000000..3964dd3f5b7f --- /dev/null +++ b/packages/firebase_performance/android/.project @@ -0,0 +1,17 @@ + + + android + Project android created by Buildship. + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/packages/firebase_performance/android/.settings/org.eclipse.buildship.core.prefs b/packages/firebase_performance/android/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 000000000000..7338097b8b8f --- /dev/null +++ b/packages/firebase_performance/android/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,13 @@ +arguments= +auto.sync=false +build.scans.enabled=false +connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(5.4)) +connection.project.dir= +eclipse.preferences.version=1 +gradle.user.home= +java.home= +jvm.arguments= +offline.mode=false +override.workspace.settings=true +show.console.view=true +show.executions.view=true diff --git a/packages/firebase_performance/example/android/.project b/packages/firebase_performance/example/android/.project new file mode 100644 index 000000000000..0e0a1bac2d3d --- /dev/null +++ b/packages/firebase_performance/example/android/.project @@ -0,0 +1,17 @@ + + + android_ + Project android_ created by Buildship. + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.buildship.core.gradleprojectnature + + diff --git a/packages/firebase_performance/example/android/.settings/org.eclipse.buildship.core.prefs b/packages/firebase_performance/example/android/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 000000000000..7338097b8b8f --- /dev/null +++ b/packages/firebase_performance/example/android/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,13 @@ +arguments= +auto.sync=false +build.scans.enabled=false +connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(5.4)) +connection.project.dir= +eclipse.preferences.version=1 +gradle.user.home= +java.home= +jvm.arguments= +offline.mode=false +override.workspace.settings=true +show.console.view=true +show.executions.view=true diff --git a/packages/firebase_performance/lib/src/firebase_performance.dart b/packages/firebase_performance/lib/src/firebase_performance.dart index e2498ec172cb..0ecad7436f9f 100644 --- a/packages/firebase_performance/lib/src/firebase_performance.dart +++ b/packages/firebase_performance/lib/src/firebase_performance.dart @@ -37,7 +37,7 @@ class FirebasePerformance { /// does not reflect whether instrumentation is enabled/disabled. Future isPerformanceCollectionEnabled() { return channel.invokeMethod( - '$FirebasePerformance#isPerformanceCollectionEnabled', + 'FirebasePerformance#isPerformanceCollectionEnabled', {'handle': _handle}, ); } @@ -48,7 +48,7 @@ class FirebasePerformance { /// application. By default, performance monitoring is enabled. Future setPerformanceCollectionEnabled(bool enable) { return channel.invokeMethod( - '$FirebasePerformance#setPerformanceCollectionEnabled', + 'FirebasePerformance#setPerformanceCollectionEnabled', {'handle': _handle, 'enable': enable}, ); } @@ -62,7 +62,7 @@ class FirebasePerformance { final int handle = _nextHandle++; FirebasePerformance.channel.invokeMethod( - '$FirebasePerformance#newTrace', + 'FirebasePerformance#newTrace', {'handle': _handle, 'traceHandle': handle, 'name': name}, ); @@ -74,7 +74,7 @@ class FirebasePerformance { final int handle = _nextHandle++; FirebasePerformance.channel.invokeMethod( - '$FirebasePerformance#newHttpMetric', + 'FirebasePerformance#newHttpMetric', { 'handle': _handle, 'httpMetricHandle': handle, diff --git a/packages/firebase_performance/lib/src/http_metric.dart b/packages/firebase_performance/lib/src/http_metric.dart index c0b27bb41ce3..704b36c12be2 100644 --- a/packages/firebase_performance/lib/src/http_metric.dart +++ b/packages/firebase_performance/lib/src/http_metric.dart @@ -59,7 +59,7 @@ class HttpMetric extends PerformanceAttributes { _httpResponseCode = httpResponseCode; FirebasePerformance.channel.invokeMethod( - '$HttpMetric#httpResponseCode', + 'HttpMetric#httpResponseCode', { 'handle': _handle, 'httpResponseCode': httpResponseCode, @@ -76,7 +76,7 @@ class HttpMetric extends PerformanceAttributes { _requestPayloadSize = requestPayloadSize; FirebasePerformance.channel.invokeMethod( - '$HttpMetric#requestPayloadSize', + 'HttpMetric#requestPayloadSize', { 'handle': _handle, 'requestPayloadSize': requestPayloadSize, @@ -93,7 +93,7 @@ class HttpMetric extends PerformanceAttributes { _responseContentType = responseContentType; FirebasePerformance.channel.invokeMethod( - '$HttpMetric#responseContentType', + 'HttpMetric#responseContentType', { 'handle': _handle, 'responseContentType': responseContentType, @@ -110,7 +110,7 @@ class HttpMetric extends PerformanceAttributes { _responsePayloadSize = responsePayloadSize; FirebasePerformance.channel.invokeMethod( - '$HttpMetric#responsePayloadSize', + 'HttpMetric#responsePayloadSize', { 'handle': _handle, 'responsePayloadSize': responsePayloadSize, @@ -129,7 +129,7 @@ class HttpMetric extends PerformanceAttributes { _hasStarted = true; return FirebasePerformance.channel.invokeMethod( - '$HttpMetric#start', + 'HttpMetric#start', {'handle': _handle}, ); } @@ -147,7 +147,7 @@ class HttpMetric extends PerformanceAttributes { _hasStopped = true; return FirebasePerformance.channel.invokeMethod( - '$HttpMetric#stop', + 'HttpMetric#stop', {'handle': _handle}, ); } diff --git a/packages/firebase_performance/lib/src/performance_attributes.dart b/packages/firebase_performance/lib/src/performance_attributes.dart index 77d4f1845303..020b61a4bafc 100644 --- a/packages/firebase_performance/lib/src/performance_attributes.dart +++ b/packages/firebase_performance/lib/src/performance_attributes.dart @@ -48,7 +48,7 @@ abstract class PerformanceAttributes { _attributes[name] = value; return FirebasePerformance.channel.invokeMethod( - '$PerformanceAttributes#putAttribute', + 'PerformanceAttributes#putAttribute', { 'handle': _handle, 'name': name, @@ -66,7 +66,7 @@ abstract class PerformanceAttributes { _attributes.remove(name); return FirebasePerformance.channel.invokeMethod( - '$PerformanceAttributes#removeAttribute', + 'PerformanceAttributes#removeAttribute', {'handle': _handle, 'name': name}, ); } @@ -85,7 +85,7 @@ abstract class PerformanceAttributes { } return FirebasePerformance.channel.invokeMapMethod( - '$PerformanceAttributes#getAttributes', + 'PerformanceAttributes#getAttributes', {'handle': _handle}, ); } diff --git a/packages/firebase_performance/lib/src/trace.dart b/packages/firebase_performance/lib/src/trace.dart index cf8e1fb01d3a..43efb2585f01 100644 --- a/packages/firebase_performance/lib/src/trace.dart +++ b/packages/firebase_performance/lib/src/trace.dart @@ -52,7 +52,7 @@ class Trace extends PerformanceAttributes { _hasStarted = true; return FirebasePerformance.channel.invokeMethod( - '$Trace#start', + 'Trace#start', {'handle': _handle}, ); } @@ -70,7 +70,7 @@ class Trace extends PerformanceAttributes { _hasStopped = true; return FirebasePerformance.channel.invokeMethod( - '$Trace#stop', + 'Trace#stop', {'handle': _handle}, ); } @@ -88,7 +88,7 @@ class Trace extends PerformanceAttributes { _metrics.putIfAbsent(name, () => 0); _metrics[name] += value; return FirebasePerformance.channel.invokeMethod( - '$Trace#incrementMetric', + 'Trace#incrementMetric', {'handle': _handle, 'name': name, 'value': value}, ); } @@ -103,7 +103,7 @@ class Trace extends PerformanceAttributes { _metrics[name] = value; return FirebasePerformance.channel.invokeMethod( - '$Trace#setMetric', + 'Trace#setMetric', {'handle': _handle, 'name': name, 'value': value}, ); } @@ -116,7 +116,7 @@ class Trace extends PerformanceAttributes { if (_hasStopped) return Future.value(_metrics[name] ?? 0); return FirebasePerformance.channel.invokeMethod( - '$Trace#getMetric', + 'Trace#getMetric', {'handle': _handle, 'name': name}, ); } From b807f21edfdc71897b56db13cae39ae8abefebfa Mon Sep 17 00:00:00 2001 From: axel-op <49279289+axel-op@users.noreply.github.com> Date: Wed, 17 Jul 2019 19:45:05 +0200 Subject: [PATCH 2/3] Updated pubspec and changelog --- packages/firebase_performance/CHANGELOG.md | 4 ++++ packages/firebase_performance/pubspec.yaml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/firebase_performance/CHANGELOG.md b/packages/firebase_performance/CHANGELOG.md index 57b64e7d2e15..94f2b52d3adb 100644 --- a/packages/firebase_performance/CHANGELOG.md +++ b/packages/firebase_performance/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.0+3 + +* Fix bug that caused invokeMethod to fail with Dart code obfuscation + ## 0.3.0+2 * Fix bug preventing this plugin from working with hot restart. diff --git a/packages/firebase_performance/pubspec.yaml b/packages/firebase_performance/pubspec.yaml index 0a8f3bd4c80a..01ab9f345c24 100644 --- a/packages/firebase_performance/pubspec.yaml +++ b/packages/firebase_performance/pubspec.yaml @@ -4,7 +4,7 @@ description: Flutter plugin for Google Performance Monitoring for Firebase, an a iOS. author: Flutter Team homepage: https://github.com/flutter/plugins/tree/master/packages/firebase_performance -version: 0.3.0+2 +version: 0.3.0+3 dependencies: flutter: From 74150062212bc4e436bab9e2db0107c5d3a9e8ab Mon Sep 17 00:00:00 2001 From: axel-op <49279289+axel-op@users.noreply.github.com> Date: Thu, 18 Jul 2019 03:41:27 +0200 Subject: [PATCH 3/3] Minor changes in order to merge --- packages/firebase_performance/CHANGELOG.md | 2 +- packages/firebase_performance/android/.project | 17 ----------------- .../.settings/org.eclipse.buildship.core.prefs | 13 ------------- .../example/android/.project | 17 ----------------- .../.settings/org.eclipse.buildship.core.prefs | 13 ------------- 5 files changed, 1 insertion(+), 61 deletions(-) delete mode 100644 packages/firebase_performance/android/.project delete mode 100644 packages/firebase_performance/android/.settings/org.eclipse.buildship.core.prefs delete mode 100644 packages/firebase_performance/example/android/.project delete mode 100644 packages/firebase_performance/example/android/.settings/org.eclipse.buildship.core.prefs diff --git a/packages/firebase_performance/CHANGELOG.md b/packages/firebase_performance/CHANGELOG.md index 94f2b52d3adb..f906a5d89c81 100644 --- a/packages/firebase_performance/CHANGELOG.md +++ b/packages/firebase_performance/CHANGELOG.md @@ -1,6 +1,6 @@ ## 0.3.0+3 -* Fix bug that caused invokeMethod to fail with Dart code obfuscation +* Fix bug that caused `invokeMethod` to fail with Dart code obfuscation ## 0.3.0+2 diff --git a/packages/firebase_performance/android/.project b/packages/firebase_performance/android/.project deleted file mode 100644 index 3964dd3f5b7f..000000000000 --- a/packages/firebase_performance/android/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - android - Project android created by Buildship. - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - - org.eclipse.buildship.core.gradleprojectnature - - diff --git a/packages/firebase_performance/android/.settings/org.eclipse.buildship.core.prefs b/packages/firebase_performance/android/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index 7338097b8b8f..000000000000 --- a/packages/firebase_performance/android/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,13 +0,0 @@ -arguments= -auto.sync=false -build.scans.enabled=false -connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(5.4)) -connection.project.dir= -eclipse.preferences.version=1 -gradle.user.home= -java.home= -jvm.arguments= -offline.mode=false -override.workspace.settings=true -show.console.view=true -show.executions.view=true diff --git a/packages/firebase_performance/example/android/.project b/packages/firebase_performance/example/android/.project deleted file mode 100644 index 0e0a1bac2d3d..000000000000 --- a/packages/firebase_performance/example/android/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - android_ - Project android_ created by Buildship. - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - - org.eclipse.buildship.core.gradleprojectnature - - diff --git a/packages/firebase_performance/example/android/.settings/org.eclipse.buildship.core.prefs b/packages/firebase_performance/example/android/.settings/org.eclipse.buildship.core.prefs deleted file mode 100644 index 7338097b8b8f..000000000000 --- a/packages/firebase_performance/example/android/.settings/org.eclipse.buildship.core.prefs +++ /dev/null @@ -1,13 +0,0 @@ -arguments= -auto.sync=false -build.scans.enabled=false -connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(5.4)) -connection.project.dir= -eclipse.preferences.version=1 -gradle.user.home= -java.home= -jvm.arguments= -offline.mode=false -override.workspace.settings=true -show.console.view=true -show.executions.view=true