Fix multiple issues

Author: ReallySmallSoftware

README.MD

@@ -21,6 +21,9 @@ AndroidManifest.xml is automatically updated to use the new MainActivity.
 Based on cordova-android-fragments (https://github.com/rajivnarayana/CordovaFragments)
 
 # History
+## 2.0.0
+- Merge changes to fix multiple issues (thanks https://github.com/mediathand)
+
 ## 1.0.0
 - Migrate to androidx
 

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="1.0.0">
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" id="cordova-plugin-android-fragmentactivity" version="2.0.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,11 +21,10 @@ Licensed to the Apache Software Foundation (ASF) under one
 
 /** extends CordovaActivity */
 
-import android.app.FragmentTransaction;
 import android.content.Intent;
 import android.os.Bundle;
 import androidx.fragment.app.FragmentActivity;
-// import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentTransaction;
 
 public class MainActivity extends FragmentActivity
 {
@@ -40,56 +39,11 @@ public void onCreate(Bundle savedInstanceState)
         super.onCreate(savedInstanceState);
 
         currentFragment = new uk.co.reallysmall.cordova.plugin.fragment.CordovaFragment();
-        FragmentTransaction ft = getFragmentManager().beginTransaction();
+        FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
         ft.add(android.R.id.content, currentFragment);
         ft.commit();
     }
 
-    /**
-     * Called when the system is about to start resuming a previous activity.
-     */
-    @Override
-    protected void onPause() {
-        super.onPause();
-        currentFragment.onPause();
-    }
-
-    /**
-     * Called when the activity will start interacting with the user.
-     */
-    @Override
-    protected void onResume() {
-        super.onResume();
-        currentFragment.onResume();
-    }
-
-    /**
-     * Called when the activity is no longer visible to the user.
-     */
-    @Override
-    protected void onStop() {
-        super.onStop();
-        currentFragment.onStop();
-    }
-
-    /**
-     * Called when the activity is becoming visible to the user.
-     */
-    @Override
-    protected void onStart() {
-        super.onStart();
-        currentFragment.onStart();
-    }
-
-    /**
-     * The final call you receive before your activity is destroyed.
-     */
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        currentFragment.onDestroy();
-    }
-
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode,resultCode,data);

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

@@ -26,7 +26,7 @@ Licensed to the Apache Software Foundation (ASF) under one
 import android.media.AudioManager;
 import android.net.http.SslError;
 import android.os.Bundle;
-import android.app.Fragment;
+import android.os.Handler;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -40,6 +40,8 @@ Licensed to the Apache Software Foundation (ASF) under one
 import android.webkit.WebViewClient;
 import android.widget.FrameLayout;
 
+import androidx.fragment.app.Fragment;
+
 import org.apache.cordova.BuildConfig;
 import org.apache.cordova.ConfigXmlParser;
 import org.apache.cordova.CordovaInterfaceImpl;
@@ -96,7 +98,8 @@ public class CordovaFragment extends Fragment {
     // The webview for our app
     protected CordovaWebView appView;
 
-
+    final Handler mHandler = new Handler();
+    
     public CordovaWebView getAppView() {
         return appView;
     }
@@ -112,24 +115,30 @@ public CordovaWebView getAppView() {
     protected ArrayList<PluginEntry> pluginEntries;
     protected CordovaInterfaceImpl cordovaInterface;
 
-    private View contentView;
+    private FrameLayout contentView;
 
     public View getContentView() {
         return contentView;
     }
 
     public void setContentView(View contentView) {
-        FrameLayout frame = new FrameLayout(this.getActivity().getBaseContext());
-        frame.addView(contentView);
-        this.contentView = frame;
+        this.contentView.removeAllViews();
+        this.contentView.addView(contentView);
     }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         if(contentView == null){
-            init();
+            this.contentView = new FrameLayout(this.getActivity().getBaseContext());
         }
         loadUrl(launchUrl);
+
+        mHandler.post(new Runnable() {
+            public void run() {
+                loadUrl(launchUrl);
+            }
+        });
+        
         return contentView;
     }
 
@@ -270,6 +279,18 @@ public void loadUrl(String url) {
         appView.loadUrlIntoView(url, true);
     }
 
+    @Override
+    public void onPause() {
+        super.onPause();
+        LOG.d(TAG, "Paused the activity.");
+
+        if (this.appView == null) {
+            return;
+        }
+
+        this.appView.handlePause(this.keepRunning);
+    }
+
     /**
      * Called when the activity will start interacting with the user.
      */