Fix crash on app termiation

Author: devgrapher

OCEBook/app/src/main/java/com/devgrapher/ocebook/HiddenRendererFragment.java

@@ -119,7 +119,7 @@ public ReadiumContext.PageEventListener createPageEventListener() {
 
             @Override
             public void onReaderInitialized() {
-                getActivity().runOnUiThread(() -> {
+                runOnUiThread(() -> {
                     final Package pckg = mReadiumCtx.getPackage();
                     if (pckg.getSpineItems().size() > 0) {
                         SpineItem item = pckg.getSpineItems().get(0);
@@ -144,7 +144,7 @@ public void onPaginationChanged(PaginationInfo currentPagesInfo) {
                 if (openPages.isEmpty())
                     return;
 
-                getActivity().runOnUiThread(() -> {
+                runOnUiThread(() -> {
                     final Page page = openPages.get(0);
 
                     int totalSpine = currentPagesInfo.getSpineItemCount();

OCEBook/app/src/main/java/com/devgrapher/ocebook/MainActivity.java

@@ -126,6 +126,15 @@ private boolean PrepareBook() {
     @Override
     protected void onDestroy() {
         super.onDestroy();
+
+        if (isFinishing()) {
+            if (mContainer != null) {
+                ObjectHolder.getInstance().removeContainer(mContainer.getNativePtr());
+                EPub3.closeBook(mContainer);
+                sContainerId = 0;
+                mContainer = null;
+            }
+        }
     }
 
     @Override
@@ -136,13 +145,6 @@ public void onBackPressed() {
         } else {
             super.onBackPressed();
         }
-
-        if (mContainer != null) {
-            ObjectHolder.getInstance().removeContainer(mContainer.getNativePtr());
-            EPub3.closeBook(mContainer);
-            sContainerId = 0;
-            mContainer = null;
-        }
     }
 
     @Override

OCEBook/app/src/main/java/com/devgrapher/ocebook/WebViewFragment.java

@@ -219,19 +219,29 @@ public void onDetach() {
     }
 
     @Override
-    public void onDestroy() {
-        super.onDestroy();
-
+    public void onDestroyView() {
         if (mReadiumCtx != null) {
+            ObjectHolder.getInstance().removeContext(mReadiumCtx.getId());
             mReadiumCtx.dispose();
         }
+        super.onDestroyView();
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
         ((ViewGroup) mWebView.getParent()).removeView(mWebView);
         mWebView.removeAllViews();
         mWebView.clearCache(true);
         mWebView.clearHistory();
         mWebView.destroy();
+    }
 
-        ObjectHolder.getInstance().removeContext(mReadiumCtx.getId());
+    public void runOnUiThread(Runnable action) {
+        if (getActivity() != null) {
+            getActivity().runOnUiThread(action);
+        }
     }
 
     /**
@@ -294,7 +304,7 @@ public ReadiumContext.PageEventListener createPageEventListener() {
 
             @Override
             public void onReaderInitialized() {
-                getActivity().runOnUiThread(() -> {
+                runOnUiThread(() -> {
                     final Package pckg = mReadiumCtx.getPackage();
 
                     // Get last open page number.
@@ -324,7 +334,7 @@ public void onPaginationChanged(PaginationInfo currentPagesInfo) {
                 if (openPages.isEmpty())
                     return;
 
-                getActivity().runOnUiThread(() -> {
+                runOnUiThread(() -> {
                     final Package pckg = mReadiumCtx.getPackage();
                     final Page page = openPages.get(0);
 

OCEBook/app/src/main/java/com/devgrapher/ocebook/readium/ReadiumContext.java

@@ -90,7 +90,6 @@ public void loadJS(String javascript) {
     }
 
     public void dispose() {
-        mWebViewDelegate.loadUrl(READER_SKELETON);
         sWebServer.reset();
     }
 

OCEBook/app/src/main/java/com/devgrapher/ocebook/server/ReadimWebServer.java

@@ -45,5 +45,6 @@ public void start(Package pckg) {
 
     public void reset() {
         mWebServer.stop();
+        Laz.yLog(TAG, "Stop Server");
     }
 }