From 6d239f40fb0765c647dfe71c41080c12ced01f84 Mon Sep 17 00:00:00 2001
From: Cristian Luis Duarte <cristian.duarte.mb@gmail.com>
Date: Thu, 19 Jul 2018 20:47:05 -0300
Subject: [PATCH] Android - Freeze at startup problem - remove logs
---
.../io/highfidelity/hifiinterface/InterfaceActivity.java | 3 ---
.../io/highfidelity/hifiinterface/SplashActivity.java | 3 ---
interface/src/Application.cpp | 8 --------
3 files changed, 14 deletions(-)
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java b/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
index 90db3fe47f..8fd8b9d0e6 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
@@ -83,7 +83,6 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
@Override
public void onCreate(Bundle savedInstanceState) {
- Log.d("[LOADSTUCK]", "InterfaceActivity::onCreate starting Interface Activity");
super.isLoading = true;
Intent intent = getIntent();
if (intent.hasExtra(DOMAIN_URL) && !intent.getStringExtra(DOMAIN_URL).isEmpty()) {
@@ -129,7 +128,6 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
getActionBar().hide();
}
});
- Log.d("[LOADSTUCK]", "InterfaceActivity::onCreate starting Loading Screen");
startActivity(new Intent(this, SplashActivity.class));
mVibrator = (Vibrator) this.getSystemService(VIBRATOR_SERVICE);
@@ -151,7 +149,6 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
layoutParams.resolveLayoutDirection(View.LAYOUT_DIRECTION_RTL);
qtLayout.addView(webSlidingDrawer, layoutParams);
webSlidingDrawer.setVisibility(View.GONE);
- Log.d("[LOADSTUCK]", "InterfaceActivity::onCreate done");
}
@Override
diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/SplashActivity.java b/android/app/src/main/java/io/highfidelity/hifiinterface/SplashActivity.java
index cd12487688..f8c9d0538f 100644
--- a/android/app/src/main/java/io/highfidelity/hifiinterface/SplashActivity.java
+++ b/android/app/src/main/java/io/highfidelity/hifiinterface/SplashActivity.java
@@ -14,11 +14,9 @@ public class SplashActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
- Log.d("[LOADSTUCK]", "SplashActivity::onCreate Creating loading screen");
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_splash);
registerLoadCompleteListener();
- Log.d("[LOADSTUCK]", "SplashActivity::onCreate registered as loaded listener");
}
@Override
@@ -41,7 +39,6 @@ public class SplashActivity extends Activity {
}
public void onAppLoadedComplete() {
- Log.d("[LOADSTUCK]", "SplashActivity::onAppLoadedComplete received");
startActivity(new Intent(this, MainActivity.class));
SplashActivity.this.finish();
}
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 55265dcfeb..31a0c2bc25 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1003,7 +1003,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
_sampleSound(nullptr)
{
- qDebug() << "[LOADSTUCK] Application::Application started constructor";
auto steamClient = PluginManager::getInstance()->getSteamClientPlugin();
setProperty(hifi::properties::STEAM, (steamClient && steamClient->isRunning()));
setProperty(hifi::properties::CRASHED, _previousSessionCrashed);
@@ -1643,7 +1642,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
}
}
});
- qDebug() << "[LOADSTUCK] Application::Application 20 user input mapper stuff done";
_applicationStateDevice = userInputMapper->getStateDevice();
_applicationStateDevice->setInputVariant(STATE_IN_HMD, []() -> float {
@@ -1711,7 +1709,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
updateHeartbeat();
loadSettings();
- qDebug() << "[LOADSTUCK] Application::Application 30 settings loaded";
updateVerboseLogging();
// Now that we've loaded the menu and thus switched to the previous display plugin
@@ -1763,7 +1760,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
connect(audioIO.data(), &AudioClient::inputReceived, audioScriptingInterface.data(), &AudioScriptingInterface::inputReceived);
this->installEventFilter(this);
- qDebug() << "[LOADSTUCK] Application::Application 40 event filter installed";
#ifdef HAVE_DDE
auto ddeTracker = DependencyManager::get<DdeFaceTracker>();
ddeTracker->init();
@@ -1897,7 +1893,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
}
return false;
});
- qDebug() << "[LOADSTUCK] Application::Application 50 entity tree stuff done";
// Keyboard focus handling for Web overlays.
auto overlays = &(qApp->getOverlays());
connect(overlays, &Overlays::overlayDeleted, [=](const OverlayID& overlayID) {
@@ -2156,7 +2151,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
// Make sure we don't time out during slow operations at startup
updateHeartbeat();
- qDebug() << "[LOADSTUCK] Application::Application 60 heartbeat updated";
OctreeEditPacketSender* packetSender = entityScriptingInterface->getPacketSender();
EntityEditPacketSender* entityPacketSender = static_cast<EntityEditPacketSender*>(packetSender);
entityPacketSender->setMyAvatar(myAvatar.get());
@@ -2217,7 +2211,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
updateSystemTabletMode();
connect(&_myCamera, &Camera::modeUpdated, this, &Application::cameraModeChanged);
- qDebug() << "[LOADSTUCK] Application::Application 70 camera mode changed connected";
DependencyManager::get<PickManager>()->setShouldPickHUDOperator([&]() { return DependencyManager::get<HMDScriptingInterface>()->isHMDMode(); });
DependencyManager::get<PickManager>()->setCalculatePos2DFromHUDOperator([&](const glm::vec3& intersection) {
const glm::vec2 MARGIN(25.0f);
@@ -2261,7 +2254,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
connect(&AndroidHelper::instance(), &AndroidHelper::beforeEnterBackground, this, &Application::beforeEnterBackground);
connect(&AndroidHelper::instance(), &AndroidHelper::enterBackground, this, &Application::enterBackground);
connect(&AndroidHelper::instance(), &AndroidHelper::enterForeground, this, &Application::enterForeground);
- qDebug() << "[LOADSTUCK] Application::Application before calling notifyLoadComplete()";
AndroidHelper::instance().notifyLoadComplete();
#endif
}