From 92cfa49bfb55fc780a1f2a34a437ef6d1001379f Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Wed, 27 Feb 2019 11:42:22 -0800 Subject: [PATCH 1/4] adding and testing command line parameter passing to application --- .../questInterface/src/main/AndroidManifest.xml | 2 +- .../questInterface/InterfaceActivity.java | 15 +++++++++++++++ .../questInterface/PermissionsChecker.java | 16 +++++++++++++++- .../oculus/OculusMobileActivity.java | 11 +++++++++++ interface/src/Application.cpp | 8 ++++---- 5 files changed, 46 insertions(+), 6 deletions(-) diff --git a/android/apps/questInterface/src/main/AndroidManifest.xml b/android/apps/questInterface/src/main/AndroidManifest.xml index a5de47bdce..0f3616612a 100644 --- a/android/apps/questInterface/src/main/AndroidManifest.xml +++ b/android/apps/questInterface/src/main/AndroidManifest.xml @@ -28,7 +28,7 @@ android:excludeFromRecents="true"> - + ()->handleLookupString(QUEST_DEV); +// / const QString QUEST_DEV = "hifi://quest-dev"; + // DependencyManager::get()->handleLookupString(QUEST_DEV); #endif } @@ -3669,8 +3669,8 @@ void Application::handleSandboxStatus(QNetworkReply* reply) { // If this is a first run we short-circuit the address passed in if (_firstRun.get()) { #if !defined(Q_OS_ANDROID) - DependencyManager::get()->goToEntry(); - sentTo = SENT_TO_ENTRY; + // DependencyManager::get()->goToEntry(); + // sentTo = SENT_TO_ENTRY; #endif _firstRun.set(false); From 29ec5486f6f49d288692eb2c4e140d4ce1f49436 Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Wed, 27 Feb 2019 15:31:23 -0800 Subject: [PATCH 2/4] manual pushing args to the app. Removed some debugging printouts --- .../questInterface/InterfaceActivity.java | 8 -------- .../io/highfidelity/oculus/OculusMobileActivity.java | 11 +++-------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/InterfaceActivity.java b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/InterfaceActivity.java index 119b009e6a..cdc48dfa37 100644 --- a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/InterfaceActivity.java +++ b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/InterfaceActivity.java @@ -14,14 +14,6 @@ public class InterfaceActivity extends OculusMobileActivity { @Override public void onCreate(Bundle savedInstanceState) { - if(this.getIntent().hasExtra("applicationArguments")){ - System.out.println("QQQ_ InterfaceActivity: args EXISTS"); - System.out.println("QQQ_ "+ this.getIntent().getStringExtra("applicationArguments")); - } - else{ - System.out.println("QQQ_ InterfaceActivity: NO argmument"); - } - HifiUtils.upackAssets(getAssets(), getCacheDir().getAbsolutePath()); super.onCreate(savedInstanceState); } diff --git a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java index 095236ecc3..75faf1e0dd 100644 --- a/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java +++ b/android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java @@ -39,19 +39,14 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca private SurfaceHolder mSurfaceHolder; public void onCreate(Bundle savedInstanceState) { - if(this.getIntent().hasExtra("applicationArguments")){ - System.out.println("QQQ_ OculusMobileActivity has arguments"); - System.out.println("QQQ_ "+ this.getIntent().getStringExtra("applicationArguments")); + if(getIntent().hasExtra("applicationArguments")){ + super.APPLICATION_PARAMETERS=getIntent().getStringExtra("applicationArguments"); } - else{ - System.out.println("QQQ_ OculusMobileActivity has NO arguments"); - } - - super.onCreate(savedInstanceState); + Log.w(TAG, "QQQ onCreate"); // Create a native surface for VR rendering (Qt GL surfaces are not suitable // because of the lack of fine control over the surface callbacks) From a425becc8a624ef215a94142b4cdf132673524e5 Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Wed, 27 Feb 2019 15:35:33 -0800 Subject: [PATCH 3/4] clean up of debugging --- android/apps/questInterface/src/main/AndroidManifest.xml | 2 +- .../highfidelity/questInterface/PermissionsChecker.java | 6 ++++-- .../java/io/highfidelity/oculus/OculusMobileActivity.java | 1 - interface/src/Application.cpp | 8 ++++---- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/android/apps/questInterface/src/main/AndroidManifest.xml b/android/apps/questInterface/src/main/AndroidManifest.xml index 0f3616612a..a5de47bdce 100644 --- a/android/apps/questInterface/src/main/AndroidManifest.xml +++ b/android/apps/questInterface/src/main/AndroidManifest.xml @@ -28,7 +28,7 @@ android:excludeFromRecents="true"> - + ()->handleLookupString(QUEST_DEV); + const QString QUEST_DEV = "hifi://quest-dev"; + DependencyManager::get()->handleLookupString(QUEST_DEV); #endif } @@ -3669,8 +3669,8 @@ void Application::handleSandboxStatus(QNetworkReply* reply) { // If this is a first run we short-circuit the address passed in if (_firstRun.get()) { #if !defined(Q_OS_ANDROID) - // DependencyManager::get()->goToEntry(); - // sentTo = SENT_TO_ENTRY; + DependencyManager::get()->goToEntry(); + sentTo = SENT_TO_ENTRY; #endif _firstRun.set(false); From 95628dfc111e771842e60cd43ddf08ed70019005 Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Wed, 27 Feb 2019 15:36:49 -0800 Subject: [PATCH 4/4] removing unused imports --- .../io/highfidelity/questInterface/InterfaceActivity.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/InterfaceActivity.java b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/InterfaceActivity.java index cdc48dfa37..df05576ea9 100644 --- a/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/InterfaceActivity.java +++ b/android/apps/questInterface/src/main/java/io/highfidelity/questInterface/InterfaceActivity.java @@ -1,16 +1,10 @@ package io.highfidelity.questInterface; -import android.content.Intent; import android.os.Bundle; -import android.text.TextUtils; - import io.highfidelity.oculus.OculusMobileActivity; import io.highfidelity.utils.HifiUtils; public class InterfaceActivity extends OculusMobileActivity { - public static final String DOMAIN_URL = "url"; - private static final String TAG = "Interface"; - public static final String EXTRA_ARGS = "args"; @Override public void onCreate(Bundle savedInstanceState) {