Merge pull request #13614 from Cristo86/android_loading_stuck

Android - App freezes on opening randomly - Fix

android/app/src/main/AndroidManifest.xml

@@ -22,7 +22,8 @@
         android:icon="@drawable/ic_launcher"
         android:launchMode="singleTop"
         android:roundIcon="@drawable/ic_launcher">
-        <activity android:name="io.highfidelity.hifiinterface.PermissionChecker">
+        <activity android:name="io.highfidelity.hifiinterface.PermissionChecker"
+            android:theme="@style/Theme.AppCompat.Translucent.NoActionBar.Launcher">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

android/app/src/main/java/io/highfidelity/hifiinterface/PermissionChecker.java

@@ -8,6 +8,7 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.util.Log;
+import android.view.View;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -135,4 +136,13 @@ public class PermissionChecker extends Activity {
             launchActivityWithPermissions();
         }
     }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        View decorView = getWindow().getDecorView();
+        // Hide the status bar.
+        int uiOptions = View.SYSTEM_UI_FLAG_FULLSCREEN | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;
+        decorView.setSystemUiVisibility(uiOptions);
+    }
 }

android/app/src/main/java/io/highfidelity/hifiinterface/fragment/HomeFragment.java

@@ -66,6 +66,7 @@ public class HomeFragment extends Fragment {
         GridLayoutManager gridLayoutMgr = new GridLayoutManager(getContext(), numberOfColumns);
         mDomainsView.setLayoutManager(gridLayoutMgr);
         mDomainAdapter = new DomainAdapter(getContext(), HifiUtils.getInstance().protocolVersionSignature(), nativeGetLastLocation());
+        mSwipeRefreshLayout.setRefreshing(true);
         mDomainAdapter.setClickListener((view, position, domain) -> {
             new Handler(getActivity().getMainLooper()).postDelayed(() -> {
                 if (mListener != null) {

android/app/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java

@@ -60,6 +60,8 @@ import android.view.View;
 import android.view.WindowManager.LayoutParams;
 import android.view.accessibility.AccessibilityEvent;
 
+import org.qtproject.qt5.android.QtNative;
+
 @SuppressWarnings("unused")
 public class QtActivity extends Activity {
     public String APPLICATION_PARAMETERS = null;
@@ -103,7 +105,7 @@ public class QtActivity extends Activity {
     }
 
     public boolean super_dispatchPopulateAccessibilityEvent(AccessibilityEvent event) {
-        return super_dispatchPopulateAccessibilityEvent(event);
+        return super.dispatchPopulateAccessibilityEvent(event);
     }
     //---------------------------------------------------------------------------
 
@@ -362,7 +364,25 @@ public class QtActivity extends Activity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        QtApplication.invokeDelegate();
+        /*
+        cduarte https://highfidelity.manuscript.com/f/cases/16712/App-freezes-on-opening-randomly
+        After Qt upgrade to 5.11 we had a black screen crash after closing the application with
+        the hardware button "Back" and trying to start the app again. It could only be fixed after
+        totally closing the app swiping it in the list of running apps.
+        This problem did not happen with the previous Qt version.
+        After analysing changes we came up with this case and change:
+            https://codereview.qt-project.org/#/c/218882/
+        In summary they've moved libs loading to the same thread as main() and as a matter of correctness
+        in the onDestroy method in QtActivityDelegate, they exit that thread with `QtNative.m_qtThread.exit();`
+        That exit call is the main reason of this problem.
+
+        In this fix we just replace the `QtApplication.invokeDelegate();` call that may end using the
+        entire onDestroy method including that thread exit line for other three lines that purposely
+        terminate qt (borrowed from QtActivityDelegate::onDestroy as well).
+         */
+        QtNative.terminateQt();
+        QtNative.setActivity(null, null);
+        System.exit(0);
     }
     //---------------------------------------------------------------------------
 

android/app/src/main/res/drawable/launch_screen.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:opacity="opaque">
+    <item android:drawable="@android:color/black"/>
+    <item android:drawable="@drawable/hifi_logo_splash"
+        android:gravity="center_horizontal"
+        android:top="225dp"
+        android:height="242dp"
+        android:width="242dp">
+    </item>
+</layer-list>

android/app/src/main/res/layout/activity_splash.xml

@@ -7,9 +7,17 @@
     android:layout_height="match_parent"
     android:background="@android:color/black">
 <ImageView
+    android:id="@+id/hifi_logo"
     android:layout_width="242dp"
     android:layout_height="242dp"
     android:src="@drawable/hifi_logo_splash"
     android:layout_centerHorizontal="true"
     android:layout_marginTop="225dp"/>
+    <ProgressBar
+        style="@style/Widget.AppCompat.ProgressBar"
+        android:theme="@style/HifiCircularProgress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/hifi_logo"
+        android:layout_centerHorizontal="true"/>
 </RelativeLayout>

android/app/src/main/res/values/colors.xml

@@ -17,4 +17,5 @@
     <color name="colorLoginError">#FF7171</color>
     <color name="black_060">#99000000</color>
     <color name="statusbar_color">#292929</color>
+    <color name="hifiLogoColor">#23B2E7</color>
 </resources>

android/app/src/main/res/values/styles.xml

@@ -19,6 +19,9 @@
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
+    <style name="Theme.AppCompat.Translucent.NoActionBar.Launcher" parent="Theme.AppCompat.Translucent.NoActionBar">
+        <item name="android:windowBackground">@drawable/launch_screen</item>
+    </style>
 
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
@@ -62,4 +65,7 @@
         <item name="android:background">@color/white_opaque</item>
     </style>
 
+    <style name="HifiCircularProgress" parent="Theme.AppCompat.Light">
+        <item name="colorAccent">@color/hifiLogoColor</item>
+    </style>
 </resources>

interface/src/main.cpp

@@ -262,6 +262,9 @@ int main(int argc, const char* argv[]) {
         // Extend argv to enable WebGL rendering
         std::vector<const char*> argvExtended(&argv[0], &argv[argc]);
         argvExtended.push_back("--ignore-gpu-blacklist");
+#ifdef Q_OS_ANDROID
+        argvExtended.push_back("--suppress-settings-reset");
+#endif
         int argcExtended = (int)argvExtended.size();
 
         PROFILE_SYNC_END(startup, "main startup", "");