diff --git a/gvr-interface/src/GVRInterface.cpp b/gvr-interface/src/GVRInterface.cpp index 2517af91f6..3c1000e9e3 100644 --- a/gvr-interface/src/GVRInterface.cpp +++ b/gvr-interface/src/GVRInterface.cpp @@ -9,7 +9,9 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -#ifdef Q_WS_ANDROID +#ifdef ANDROID + +#include #include #include @@ -58,8 +60,20 @@ GVRInterface::GVRInterface(int argc, char* argv[]) : idleTimer->start(0); } +#ifdef ANDROID + +extern "C" { + +JNIEXPORT void Java_io_highfidelity_gvrinterface_InterfaceActivity_handleHifiURL(JNIEnv *jni, jclass clazz, jstring hifiURLString) { + qDebug() << "The lookup string in c++ is" << QAndroidJniObject(hifiURLString).toString(); +} + +} + +#endif + void GVRInterface::idle() { -#if defined(Q_WS_ANDROID) && defined(HAVE_LIBOVR) +#if defined(ANDROID) && defined(HAVE_LIBOVR) if (!_inVRMode && ovr_IsHeadsetDocked()) { qDebug() << "The headset just got docked - assume we are in VR mode."; _inVRMode = true; diff --git a/gvr-interface/src/GVRMainWindow.cpp b/gvr-interface/src/GVRMainWindow.cpp index 310d24e5c5..3176457677 100644 --- a/gvr-interface/src/GVRMainWindow.cpp +++ b/gvr-interface/src/GVRMainWindow.cpp @@ -29,7 +29,7 @@ GVRMainWindow::GVRMainWindow(QWidget* parent) : QMainWindow(parent) { -#ifndef Q_OS_ANDROID +#ifndef ANDROID const int NOTE_4_WIDTH = 2560; const int NOTE_4_HEIGHT = 1440; setFixedSize(NOTE_4_WIDTH / 2, NOTE_4_HEIGHT / 2); diff --git a/gvr-interface/src/java/io/highfidelity/gvrinterface/InterfaceActivity.java b/gvr-interface/src/java/io/highfidelity/gvrinterface/InterfaceActivity.java index 2b35c19960..c7cbdd3dff 100644 --- a/gvr-interface/src/java/io/highfidelity/gvrinterface/InterfaceActivity.java +++ b/gvr-interface/src/java/io/highfidelity/gvrinterface/InterfaceActivity.java @@ -20,6 +20,8 @@ import org.qtproject.qt5.android.bindings.QtActivity; public class InterfaceActivity extends QtActivity { + public static native void handleHifiURL(String hifiURLString); + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -31,7 +33,7 @@ public class InterfaceActivity extends QtActivity { Uri data = intent.getData(); if (data.getScheme().equals("hifi")) { - + handleHifiURL(data.toString()); } }