diff --git a/cmake/android/AndroidManifest.xml.in b/cmake/android/AndroidManifest.xml.in
index 2459627f50..39c97a6608 100755
--- a/cmake/android/AndroidManifest.xml.in
+++ b/cmake/android/AndroidManifest.xml.in
@@ -9,7 +9,7 @@
+#include
#include
#include
#include
@@ -28,6 +29,9 @@ Client::Client(QObject* parent) :
}
void Client::setupNetworking() {
+ // once Application order of instantiation is fixed this should be done from AccountManager
+ AccountManager::getInstance().setAuthURL(DEFAULT_NODE_AUTH_URL);
+
// setup the NodeList for this client
DependencyManager::registerInheritance();
auto nodeList = DependencyManager::set(NodeType::Agent, 0);
diff --git a/gvr-interface/src/GVRInterface.cpp b/gvr-interface/src/GVRInterface.cpp
index 1101325823..1a18529793 100644
--- a/gvr-interface/src/GVRInterface.cpp
+++ b/gvr-interface/src/GVRInterface.cpp
@@ -79,7 +79,7 @@ void GVRInterface::idle() {
auto ovrOrientation = sensor.Predicted.Pose.Orientation;
glm::quat newOrientation(ovrOrientation.w, ovrOrientation.x, ovrOrientation.y, ovrOrientation.z);
- // _client->setOrientation(newOrientation);
+ _client->setOrientation(newOrientation);
if (counter++ % 100000 == 0) {
qDebug() << "GetSensorState in frame" << counter << "-"
diff --git a/gvr-interface/src/RenderingClient.cpp b/gvr-interface/src/RenderingClient.cpp
index 5683c8e01e..3113cbf838 100644
--- a/gvr-interface/src/RenderingClient.cpp
+++ b/gvr-interface/src/RenderingClient.cpp
@@ -74,7 +74,6 @@ void RenderingClient::processVerifiedPacket(const HifiSockAddr& senderSockAddr,
Qt::QueuedConnection,
Q_ARG(QByteArray, incomingPacket));
} else {
- qDebug() << "Processing received audio of" << incomingPacket.size();
QMetaObject::invokeMethod(DependencyManager::get().data(), "addReceivedAudioToStream",
Qt::QueuedConnection,
Q_ARG(QByteArray, incomingPacket));
diff --git a/gvr-interface/src/java/io/highfidelity/gvrinterface/InterfaceActivity.java b/gvr-interface/src/java/io/highfidelity/gvrinterface/InterfaceActivity.java
new file mode 100644
index 0000000000..be4d42e725
--- /dev/null
+++ b/gvr-interface/src/java/io/highfidelity/gvrinterface/InterfaceActivity.java
@@ -0,0 +1,25 @@
+//
+// InterfaceActivity.java
+// gvr-interface/java
+//
+// Created by Stephen Birarda on 1/26/15.
+// Copyright 2015 High Fidelity, Inc.
+//
+// Distributed under the Apache License, Version 2.0.
+// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+package io.highfidelity.gvrinterface;
+
+import android.os.Bundle;
+import android.view.WindowManager;
+import org.qtproject.qt5.android.bindings.QtActivity;
+
+public class InterfaceActivity extends QtActivity {
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+ }
+}
\ No newline at end of file
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 20dc50bcac..c25e39599a 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -227,7 +227,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
auto nodeList = DependencyManager::get();
Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us
-
// read the ApplicationInfo.ini file for Name/Version/Domain information
QSettings applicationInfo(PathUtils::resourcesPath() + "info/ApplicationInfo.ini", QSettings::IniFormat);
diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp
index aa282de015..2ce11ae38b 100644
--- a/libraries/networking/src/AccountManager.cpp
+++ b/libraries/networking/src/AccountManager.cpp
@@ -74,8 +74,6 @@ AccountManager::AccountManager() :
qRegisterMetaType("JSONCallbackParameters");
qRegisterMetaType("QHttpMultiPart*");
-
- setAuthURL(DEFAULT_NODE_AUTH_URL);
connect(&_accountInfo, &DataServerAccountInfo::balanceChanged, this, &AccountManager::accountInfoBalanceChanged);
}