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 08f8615a16..893c13f337 100644 --- a/android/app/src/main/java/io/highfidelity/hifiinterface/SplashActivity.java +++ b/android/app/src/main/java/io/highfidelity/hifiinterface/SplashActivity.java @@ -27,10 +27,7 @@ public class SplashActivity extends Activity { } public void onAppLoadedComplete() { - // Give interface more time so textures don't fail(got deleted) on Adreno (joystick) - new Handler(getMainLooper()).postDelayed(() -> { - startActivity(new Intent(this, HomeActivity.class)); - new Handler(getMainLooper()).postDelayed(() -> SplashActivity.this.finish(), 1000); - }, 500); + startActivity(new Intent(this, HomeActivity.class)); + finish(); } } diff --git a/interface/src/AndroidHelper.cpp b/interface/src/AndroidHelper.cpp index 10745b71ab..339d2532a6 100644 --- a/interface/src/AndroidHelper.cpp +++ b/interface/src/AndroidHelper.cpp @@ -11,9 +11,7 @@ #include "AndroidHelper.h" #include -AndroidHelper::AndroidHelper() : -_accountManager () -{ +AndroidHelper::AndroidHelper() { } AndroidHelper::~AndroidHelper() { @@ -38,11 +36,3 @@ void AndroidHelper::goBackFromAndroidActivity() { void AndroidHelper::notifyLoginComplete(bool success) { emit loginComplete(success); } - -void AndroidHelper::setInBackground(bool background) { - inBackground = background; -} - -bool AndroidHelper::isInBackground() { - return inBackground; -} diff --git a/interface/src/AndroidHelper.h b/interface/src/AndroidHelper.h index 51ef51ee4f..b9f7407453 100644 --- a/interface/src/AndroidHelper.h +++ b/interface/src/AndroidHelper.h @@ -26,8 +26,6 @@ public: void requestActivity(const QString &activityName); void notifyLoadComplete(); void goBackFromAndroidActivity(); - void setInBackground(bool background); - bool isInBackground(); void notifyLoginComplete(bool success); @@ -45,8 +43,6 @@ signals: private: AndroidHelper(); ~AndroidHelper(); - QSharedPointer _accountManager; - bool inBackground; }; #endif \ No newline at end of file diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 46d06f6443..e82a6d9965 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -4330,13 +4330,7 @@ void setupCpuMonitorThread() { void Application::idle() { PerformanceTimer perfTimer("idle"); - -#if defined(Q_OS_ANDROID) - if (AndroidHelper::instance().isInBackground()) { - return; - } -#endif - + // Update the deadlock watchdog updateHeartbeat(); @@ -8183,13 +8177,15 @@ void Application::openAndroidActivity(const QString& activityName) { void Application::enterBackground() { QMetaObject::invokeMethod(DependencyManager::get().data(), "stop", Qt::BlockingQueuedConnection); - AndroidHelper::instance().setInBackground(true); + getActiveDisplayPlugin()->deactivate(); } void Application::enterForeground() { QMetaObject::invokeMethod(DependencyManager::get().data(), "start", Qt::BlockingQueuedConnection); - AndroidHelper::instance().setInBackground(false); + if (!getActiveDisplayPlugin() || !getActiveDisplayPlugin()->activate()) { + qWarning() << "Could not re-activate display plugin"; + } } #endif