Add support for Oculus App Linking

MozillaReality · Mar 19, 2020 · 0dcaba4 · 0dcaba4
1 parent a52060c
commit 0dcaba4
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 4 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java
@@ -1085,6 +1085,17 @@ private void handlePoorPerformance() {
         });
     }
 
+    @Keep
+    @SuppressWarnings("unused")
+    private void loadUri(String aURL) {
+        runOnUiThread(() -> {
+            Session session = SessionStore.get().getActiveSession();
+            if (session != null) {
+                session.loadUri(aURL);
+            }
+        });
+    }
+
     private SurfaceTexture createSurfaceTexture() {
         int[] ids = new int[1];
         GLES20.glGenTextures(1, ids, 0);

diff --git a/app/src/main/cpp/VRBrowser.cpp b/app/src/main/cpp/VRBrowser.cpp
@@ -52,6 +52,8 @@ const char* kHaltActivity = "haltActivity";
 const char* kHaltActivitySignature = "(I)V";
 const char* kHandlePoorPerformance = "handlePoorPerformance";
 const char* kHandlePoorPerformanceSignature = "()V";
+const char* kLoadUri = "loadUri";
+const char* kLoadUriSignature = "(Ljava/lang/String;)V";
 
 JNIEnv* sEnv = nullptr;
 jclass sBrowserClass = nullptr;
@@ -77,6 +79,7 @@ jmethodID sAreLayersEnabled = nullptr;
 jmethodID sSetDeviceType = nullptr;
 jmethodID sHaltActivity = nullptr;
 jmethodID sHandlePoorPerformance = nullptr;
+jmethodID sLoadUri = nullptr;
 }
 
 namespace crow {
@@ -117,6 +120,7 @@ VRBrowser::InitializeJava(JNIEnv* aEnv, jobject aActivity) {
   sSetDeviceType = FindJNIMethodID(sEnv, sBrowserClass, kSetDeviceType, kSetDeviceTypeSignature);
   sHaltActivity = FindJNIMethodID(sEnv, sBrowserClass, kHaltActivity, kHaltActivitySignature);
   sHandlePoorPerformance = FindJNIMethodID(sEnv, sBrowserClass, kHandlePoorPerformance, kHandlePoorPerformanceSignature);
+  sLoadUri = FindJNIMethodID(sEnv, sBrowserClass, kLoadUri, kLoadUriSignature);
 }
 
 void
@@ -151,6 +155,7 @@ VRBrowser::ShutdownJava() {
   sAreLayersEnabled = nullptr;
   sSetDeviceType = nullptr;
   sHaltActivity = nullptr;
+  sLoadUri = nullptr;
   sEnv = nullptr;
 }
 
@@ -339,4 +344,13 @@ VRBrowser::HandlePoorPerformance() {
   CheckJNIException(sEnv, __FUNCTION__);
 }
 
+void
+VRBrowser::LoadUri(const std::string& aURL) {
+  if (!ValidateMethodID(sEnv, sActivity, sLoadUri, __FUNCTION__)) { return; }
+  jstring uri = sEnv->NewStringUTF(aURL.c_str());
+  sEnv->CallVoidMethod(sActivity, sLoadUri, uri);
+  sEnv->DeleteLocalRef(uri);
+  CheckJNIException(sEnv, __FUNCTION__);
+}
+
 } // namespace crow
diff --git a/app/src/main/cpp/VRBrowser.h b/app/src/main/cpp/VRBrowser.h
@@ -39,6 +39,7 @@ bool AreLayersEnabled();
 void SetDeviceType(const jint aType);
 void HaltActivity(const jint aReason);
 void HandlePoorPerformance();
+void LoadUri(const std::string& aURL);
 } // namespace VRBrowser;
 
 } // namespace crow

diff --git a/app/src/oculusvr/cpp/DeviceDelegateOculusVR.cpp b/app/src/oculusvr/cpp/DeviceDelegateOculusVR.cpp
@@ -777,10 +777,6 @@ DeviceDelegateOculusVR::SetCPULevel(const device::CPULevel aLevel) {
 
 void
 DeviceDelegateOculusVR::ProcessEvents() {
-  if (m.applicationEntitled) {
-    return;
-  }
-
   ovrMessageHandle message;
   while ((message = ovr_PopMessage()) != nullptr) {
     switch (ovr_Message_GetType(message)) {
@@ -812,6 +808,14 @@ DeviceDelegateOculusVR::ProcessEvents() {
           m.applicationEntitled = true;
         }
         break;
+      case ovrMessage_Notification_ApplicationLifecycle_LaunchIntentChanged: {
+        auto details = ovr_ApplicationLifecycle_GetLaunchDetails();
+        const char *msg = ovr_LaunchDetails_GetDeeplinkMessage(details);
+        if (msg) {
+          VRBrowser::LoadUri(msg);
+        }
+        break;
+      }
       default:
         break;
     }