Cleanup

Justin McPherson · Justin McPherson · commit 4ced394e2620 · 2016-07-29T16:10:05.000+10:00
diff --git a/ReactUbuntu/runtime/src/reactbridge.cpp b/ReactUbuntu/runtime/src/reactbridge.cpp
@@ -130,7 +130,6 @@ ReactBridge::ReactBridge(QObject* parent)
 {
   Q_D(ReactBridge);
 
-
   d->eventDispatcher = new ReactEventDispatcher(this);
 }
 
@@ -339,9 +338,9 @@ ReactRedboxItem* ReactBridge::redbox()
 void ReactBridge::sourcesFinished()
 {
   Q_D(ReactBridge);
-  // XXX:
-  QTimer::singleShot(200, [=]() {
-      d->executor->executeApplicationScript(d->sourceCode->sourceCode(), d->bundleUrl);
+  QTimer::singleShot(0, [=] {
+      d->executor->executeApplicationScript(d->sourceCode->sourceCode(),
+                                            d->bundleUrl);
     });
 }
 
@@ -420,7 +419,7 @@ void ReactBridge::processResult(const QJsonDocument& doc)
     return;
 
   if (!doc.isArray()) {
-    qCritical() << "Returned document from executor in unexpected form";
+    qCritical() << __PRETTY_FUNCTION__ << "Returned document from executor in unexpected form";
     return;
   }
 
@@ -439,13 +438,13 @@ void ReactBridge::processResult(const QJsonDocument& doc)
   for (int i = 0; i < moduleIDs.size(); ++i) {
     ReactModuleData* moduleData = d->modules[moduleIDs[i].toInt()];
     if (moduleData == nullptr) {
-      qCritical() << "Could not find referenced module";
+      qCritical() << __PRETTY_FUNCTION__ << "Could not find referenced module";
       continue;
     }
 
     ReactModuleMethod* method = moduleData->method(methodIDs[i].toInt());
     if (method == nullptr) {
-      qCritical() << "Request for unsupported method";
+      qCritical() << __PRETTY_FUNCTION__ << "Request for unsupported method";
       continue;
     }
 
diff --git a/ReactUbuntu/runtime/src/reactnetinfo.cpp b/ReactUbuntu/runtime/src/reactnetinfo.cpp
@@ -29,9 +29,7 @@ static QMap<QNetworkAccessManager::NetworkAccessibility, QString> accessibleName
 class ReactNetInfoPrivate {
 public:
   void monitorNetworkAccess() {
-    qDebug() << __PRETTY_FUNCTION__;
     QObject::connect(bridge->networkAccessManager(), &QNetworkAccessManager::networkAccessibleChanged, [=](QNetworkAccessManager::NetworkAccessibility accessible) {
-        qDebug() << __PRETTY_FUNCTION__ << accessible;
         bridge->eventDispatcher()->sendDeviceEvent("networkStatusDidChange", QVariantList{
               QVariantMap{{"network_info", accessibleName.value(accessible)}}
           });
@@ -48,7 +46,6 @@ void ReactNetInfo::getCurrentConnectivity(
 ) {
   Q_UNUSED(reject);
   Q_D(ReactNetInfo);
-  qDebug() << __PRETTY_FUNCTION__ << accessibleName.value(d->bridge->networkAccessManager()->networkAccessible());
   resolve(d->bridge, QVariantList{
                         QVariantMap{{"network_info",
                                     accessibleName.value(d->bridge->networkAccessManager()->networkAccessible())}}

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,6 @@ ReactBridge::ReactBridge(QObject* parent)`
`130`	`130`	`{`
`131`	`131`	`Q_D(ReactBridge);`
`132`	`132`
`133`		`-`
`134`	`133`	`d->eventDispatcher = new ReactEventDispatcher(this);`
`135`	`134`	`}`
`136`	`135`
`@@ -339,9 +338,9 @@ ReactRedboxItem* ReactBridge::redbox()`
`339`	`338`	`void ReactBridge::sourcesFinished()`
`340`	`339`	`{`
`341`	`340`	`Q_D(ReactBridge);`
`342`		`- // XXX:`
`343`		`- QTimer::singleShot(200, [=]() {`
`344`		`- d->executor->executeApplicationScript(d->sourceCode->sourceCode(), d->bundleUrl);`
	`341`	`+ QTimer::singleShot(0, [=] {`
	`342`	`+ d->executor->executeApplicationScript(d->sourceCode->sourceCode(),`
	`343`	`+ d->bundleUrl);`
`345`	`344`	`});`
`346`	`345`	`}`
`347`	`346`
`@@ -420,7 +419,7 @@ void ReactBridge::processResult(const QJsonDocument& doc)`
`420`	`419`	`return;`
`421`	`420`
`422`	`421`	`if (!doc.isArray()) {`
`423`		`- qCritical() << "Returned document from executor in unexpected form";`
	`422`	`+ qCritical() << __PRETTY_FUNCTION__ << "Returned document from executor in unexpected form";`
`424`	`423`	`return;`
`425`	`424`	`}`
`426`	`425`
`@@ -439,13 +438,13 @@ void ReactBridge::processResult(const QJsonDocument& doc)`
`439`	`438`	`for (int i = 0; i < moduleIDs.size(); ++i) {`
`440`	`439`	`ReactModuleData* moduleData = d->modules[moduleIDs[i].toInt()];`
`441`	`440`	`if (moduleData == nullptr) {`
`442`		`- qCritical() << "Could not find referenced module";`
	`441`	`+ qCritical() << __PRETTY_FUNCTION__ << "Could not find referenced module";`
`443`	`442`	`continue;`
`444`	`443`	`}`
`445`	`444`
`446`	`445`	`ReactModuleMethod* method = moduleData->method(methodIDs[i].toInt());`
`447`	`446`	`if (method == nullptr) {`
`448`		`- qCritical() << "Request for unsupported method";`
	`447`	`+ qCritical() << __PRETTY_FUNCTION__ << "Request for unsupported method";`
`449`	`448`	`continue;`
`450`	`449`	`}`
`451`	`450`