From 77d4060fdb8b78ac2e1bdfeffaa9d75502bb3861 Mon Sep 17 00:00:00 2001
From: amer cerkic <amer@highfidelity.io>
Date: Thu, 21 Feb 2019 11:37:50 -0800
Subject: [PATCH] bypassing onStop invoke.Delegate command which prevents the
 disconnect from Java hooks that are not initiated on restart.  On Destroy,
 the onstop function is called to allow the hooks to finally disconnect and
 then terminate the app.

---
 .../oculus/OculusMobileActivity.java          | 24 +++++++++++--------
 .../qt5/android/bindings/QtActivity.java      |  7 +++++-
 2 files changed, 20 insertions(+), 11 deletions(-)

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 9ab07bb4dd..2aa7b4da05 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
@@ -34,7 +34,6 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca
     private native void questNativeOnResume();
     private native void questOnAppAfterLoad();
 
-
     private SurfaceView mView;
     private SurfaceHolder mSurfaceHolder;
 
@@ -57,12 +56,15 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca
             setContentView(mView);
             questOnAppAfterLoad();
         });
+
+
     }
 
     @Override
     protected void onDestroy() {
         Log.w(TAG, "QQQ onDestroy");
-
+        isPausing=false;
+        super.onStop();
         nativeOnSurfaceChanged(null);
 
         Log.w(TAG, "QQQ onDestroy -- SUPER onDestroy");
@@ -78,6 +80,7 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca
 
         questNativeOnResume();
         nativeOnResume();
+        isPausing=false;
     }
 
     @Override
@@ -87,40 +90,41 @@ public class OculusMobileActivity extends QtActivity implements SurfaceHolder.Ca
 
         questNativeOnPause();
         nativeOnPause();
+        isPausing=true;
     }
 
     @Override
     protected void onStop(){
         super.onStop();
-        Log.w(TAG, "QQQ Onstop called");
+        Log.w(TAG, "QQQ_ Onstop called");
     }
 
     @Override
-    protected void onRestart(){
+    protected void onRestart() {
         super.onRestart();
-        Log.w(TAG, "QQQ onRestart called ****");
+        Log.w(TAG, "QQQ_ onRestart called ****");
         questOnAppAfterLoad();
     }
 
     @Override
     public void surfaceCreated(SurfaceHolder holder) {
-        Log.w(TAG, "QQQ surfaceCreated ************************************");
+        Log.w(TAG, "QQQ_ surfaceCreated ************************************");
         nativeOnSurfaceChanged(holder.getSurface());
         mSurfaceHolder = holder;
     }
 
     @Override
     public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-        Log.w(TAG, "QQQ surfaceChanged");
+        Log.w(TAG, "QQQ_ surfaceChanged");
         nativeOnSurfaceChanged(holder.getSurface());
         mSurfaceHolder = holder;
     }
 
     @Override
     public void surfaceDestroyed(SurfaceHolder holder) {
-        Log.w(TAG, "QQQ surfaceDestroyed ***************************************************");
-        nativeOnSurfaceChanged(null);
-        mSurfaceHolder = null;
+        Log.w(TAG, "QQQ_ surfaceDestroyed ***************************************************");
+      //  nativeOnSurfaceChanged(null);
+       // mSurfaceHolder = null;
 
     }
 }
\ No newline at end of file
diff --git a/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java b/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
index 46f2af46e7..85e93a4267 100644
--- a/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
+++ b/android/libraries/qt/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
@@ -70,6 +70,7 @@ public class QtActivity extends Activity {
     public final String QT_ANDROID_DEFAULT_THEME = QT_ANDROID_THEMES[0]; // sets the default theme.
     private QtActivityLoader m_loader = new QtActivityLoader(this);
 
+    public boolean isPausing=false;
     public QtActivity() {
     }
 
@@ -650,9 +651,13 @@ public class QtActivity extends Activity {
     @Override
     protected void onStop() {
         super.onStop();
-        QtApplication.invokeDelegate();
+
+        if(!isPausing){
+            QtApplication.invokeDelegate();
+        }
     }
 
+
     //---------------------------------------------------------------------------
 
     @Override