Add fixes from main cordova repo and handle onNewIntent and existing fragment

Author: ReallySmallSoftware

README.MD

@@ -21,6 +21,13 @@ AndroidManifest.xml is automatically updated to use the new MainActivity.
 Based on cordova-android-fragments (https://github.com/rajivnarayana/CordovaFragments)
 
 # History
+## 2.2.0
+- Add support for onNewIntent
+- Apply some fixes from main cordova repo
+
+## 2.1.0
+- Add fix to ensure only root task runs
+
 ## 2.0.0
 - Merge changes to fix multiple issues (thanks https://github.com/mediathand)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-android-fragmentactivity",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "description": "An android plugin that provides a replacement activity to the default activity to start a cordova application with MainActivity as a Fragment Activity. Useful when you want to add native views on top of cordova webview.",
   "cordova": {
     "id": "cordova-plugin-android-fragmentactivity",

plugin.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" id="cordova-plugin-android-fragmentactivity" version="2.0.0">
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" id="cordova-plugin-android-fragmentactivity" version="2.2.0">
 
   <name>Cordova Android FragmentActivity Plugin</name>
   <description>An android plugin that provides a replacement activity to the default activity to start a cordova application with MainActivity as a Fragment Activity. Useful when you want to add native views on top of cordova webview.</description>

src/android/MainActivity.java

@@ -21,9 +21,13 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 /** extends CordovaActivity */
 
+import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
+
 import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
 public class MainActivity extends FragmentActivity
@@ -38,10 +42,47 @@ public void onCreate(Bundle savedInstanceState)
 
         super.onCreate(savedInstanceState);
 
-        currentFragment = new uk.co.reallysmall.cordova.plugin.fragment.CordovaFragment();
-        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-        ft.add(android.R.id.content, currentFragment);
-        ft.commit();
+        if (!this.isTaskRoot()) {
+            finish();
+            return;
+        }
+
+        FragmentManager fm = getSupportFragmentManager();
+
+        currentFragment = (CordovaFragment) fm.findFragmentByTag("${mypackage}");
+
+        if (currentFragment == null) {
+            currentFragment = new uk.co.reallysmall.cordova.plugin.fragment.CordovaFragment();
+            FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+            ft.add(android.R.id.content, currentFragment,${mypackage});
+            ft.commit();
+        }
+    }
+    
+    protected void onSaveInstanceState(Bundle outState) {
+        currentFragment.onSaveInstanceState(outState);
+        super.onSaveInstanceState(outState);
+    }
+
+    /**
+     * Called when the activity receives a new intent
+     */
+    @Override
+    protected void onNewIntent(Intent intent) {
+        super.onNewIntent(intent);
+
+        currentFragment.onNewIntent(intent);
+    }
+
+    /**
+     * Called when view focus is changed
+     */
+    @SuppressLint("InlinedApi")
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+
+        currentFragment.onWindowFocusChanged(hasFocus);
     }
 
     @Override

src/android/uk/co/reallysmall/cordova/plugin/fragment/CordovaFragment.java

@@ -43,6 +43,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import androidx.fragment.app.Fragment;
 
 import org.apache.cordova.BuildConfig;
+import org.apache.cordova.Config;
 import org.apache.cordova.ConfigXmlParser;
 import org.apache.cordova.CordovaInterfaceImpl;
 import org.apache.cordova.CordovaPreferences;
@@ -109,6 +110,9 @@ public CordovaWebView getAppView() {
     // when another application (activity) is started.
     protected boolean keepRunning = true;
 
+    // Flag to keep immersive mode if set to fullscreen
+    protected boolean immersiveMode;
+
     // Read from config.xml:
     protected CordovaPreferences preferences;
     protected String launchUrl;
@@ -170,14 +174,17 @@ public void onCreate(Bundle savedInstanceState) {
             getActivity().getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
                     WindowManager.LayoutParams.FLAG_FULLSCREEN);
         } else if (preferences.getBoolean("Fullscreen", false)) {
-            getActivity().getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
-                    WindowManager.LayoutParams.FLAG_FULLSCREEN);
+            if (!preferences.getBoolean("FullscreenNotImmersive", false)) {
+                immersiveMode = true;
+            } else {
+                getActivity().getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
+                        WindowManager.LayoutParams.FLAG_FULLSCREEN);
+            }
         } else {
             getActivity().getWindow().setFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN,
                     WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
         }
 
-
         super.onCreate(savedInstanceState);
 
         cordovaInterface = makeCordovaInterface();
@@ -219,7 +226,7 @@ protected void loadConfig() {
         preferences.setPreferencesBundle(getActivity().getIntent().getExtras());
         launchUrl = parser.getLaunchUrl();
         pluginEntries = parser.getPluginEntries();
-//        Config.parser = parser;
+      //  Config.parser = parser;
     }
 
     //Suppressing warnings in AndroidStudio
@@ -234,9 +241,14 @@ protected void createViews() {
         setContentView(appView.getView());
 
         if (preferences.contains("BackgroundColor")) {
-            int backgroundColor = preferences.getInteger("BackgroundColor", Color.BLACK);
-            // Background of activity:
-            appView.getView().setBackgroundColor(backgroundColor);
+            try {
+                int backgroundColor = preferences.getInteger("BackgroundColor", Color.BLACK);
+                // Background of activity:
+                appView.getView().setBackgroundColor(backgroundColor);
+            }
+            catch (NumberFormatException e){
+                e.printStackTrace();
+            }
         }
 
         appView.getView().requestFocusFromTouch();
@@ -284,11 +296,21 @@ public void onPause() {
         super.onPause();
         LOG.d(TAG, "Paused the activity.");
 
-        if (this.appView == null) {
-            return;
+        if (this.appView != null) {
+            // CB-9382 If there is an activity that started for result and main activity is waiting for callback
+            // result, we shoudn't stop WebView Javascript timers, as activity for result might be using them
+            boolean keepRunning = this.keepRunning;// || this.cordovaInterface.activityResultCallback != null;
+            this.appView.handlePause(keepRunning);
         }
+    }
 
-        this.appView.handlePause(this.keepRunning);
+    /**
+     * Called when the activity receives a new intent
+     */
+    public void onNewIntent(Intent intent) {
+        //Forward to plugins
+        if (this.appView != null)
+            this.appView.onNewIntent(intent);
     }
 
     /**
@@ -302,9 +324,11 @@ public void onResume() {
         if (this.appView == null) {
             return;
         }
-        // Force window to have focus, so application always
-        // receive user input. Workaround for some devices (Samsung Galaxy Note 3 at least)
-        this.getActivity().getWindow().getDecorView().requestFocus();
+        if (!getActivity().getWindow().getDecorView().hasFocus()) {
+            // Force window to have focus, so application always
+            // receive user input. Workaround for some devices (Samsung Galaxy Note 3 at least)
+            getActivity().getWindow().getDecorView().requestFocus();
+        }
 
         this.appView.handleResume(this.keepRunning);
     }
@@ -352,6 +376,22 @@ public void onDestroy() {
          }
      }
 
+    /**
+     * Called when view focus is changed
+     */
+    public void onWindowFocusChanged(boolean hasFocus) {
+        if (hasFocus && immersiveMode) {
+            final int uiOptions = View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                    | View.SYSTEM_UI_FLAG_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
+
+            getActivity().getWindow().getDecorView().setSystemUiVisibility(uiOptions);
+        }
+    }
+
     @Override
     public void startActivityForResult(Intent intent, int requestCode) {
         // Capture requestCode here so that it is captured in the setActivityResultCallback() case.