Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

clean up of debugging

Browse source
This commit is contained in:
amer cerkic 2019-02-27 15:35:33 -08:00
parent 29ec5486f6
commit a425becc8a
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/apps/questInterface/src/main/AndroidManifest.xml
View file

@ -28,7 +28,7 @@
android:excludeFromRecents="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.INFO" />
</intent-filter>
</activity>
<activity

6
android/apps/questInterface/src/main/java/io/highfidelity/questInterface/PermissionsChecker.java
View file

@ -23,13 +23,15 @@ public class PermissionsChecker extends Activity {
private static final String EXTRA_ARGS = "args";
private String mArgs;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mArgs =(getIntent().getStringExtra(EXTRA_ARGS));
System.out.println("QQQ_ launched args: "+mArgs);
if(!TextUtils.isEmpty(mArgs)) {
System.out.println("Application launched with following args: " + mArgs);
}
requestAppPermissions(REQUIRED_PERMISSIONS,REQUEST_PERMISSIONS);
}

1
android/libraries/oculus/src/main/java/io/highfidelity/oculus/OculusMobileActivity.java
View file

@ -46,7 +46,6 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca
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)

8
interface/src/Application.cpp
View file

@ -2419,8 +2419,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
pauseUntilLoginDetermined();
#if defined(Q_OS_ANDROID)
// / const QString QUEST_DEV = "hifi://quest-dev";
// DependencyManager::get<AddressManager>()->handleLookupString(QUEST_DEV);
const QString QUEST_DEV = "hifi://quest-dev";
DependencyManager::get<AddressManager>()->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<AddressManager>()->goToEntry();
// sentTo = SENT_TO_ENTRY;
DependencyManager::get<AddressManager>()->goToEntry();
sentTo = SENT_TO_ENTRY;
#endif
_firstRun.set(false);