summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java37
1 files changed, 20 insertions, 17 deletions
diff --git a/org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java b/org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java
index 5ebd44a..60c9a4a 100644
--- a/org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java
+++ b/org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java
@@ -41,13 +41,9 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;

 import androidx.core.content.ContextCompat;

 import androidx.core.view.WindowInsetsControllerCompat;

-import androidx.lifecycle.Observer;

 import androidx.lifecycle.ViewModelProvider;

 import androidx.webkit.WebViewAssetLoader;

 

-import java.security.PrivateKey;

-import java.security.cert.X509Certificate;

-

 public class MasterActivity extends AppCompatActivity implements NetworkStateReceiver.NetworkStateReceiverListener {

 

     private final String TAG = this.getClass().getSimpleName();

@@ -196,21 +192,13 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
                 Log.d(TAG, "observed private key: " + privateKey);

 

                 if (privateKey != null) {

-                    Log.d(TAG, "key loaded, triggering loadUrl...");

+                    Log.d(TAG, "key loaded, loading webview contents...");

 

-                    if (savedInstanceState == null || m_lastVisitedURL == null) {

-                        m_web.loadUrl(m_baseUrl + "/index.php");

-                    } else {

-                        m_web.loadUrl(m_lastVisitedURL);

-                    }

+                    restoreWebView(savedInstanceState);

                 }

             });

         } else {

-            if (savedInstanceState == null || m_lastVisitedURL == null) {

-                m_web.loadUrl(m_baseUrl + "/index.php");

-            } else {

-                m_web.loadUrl(m_lastVisitedURL);

-            }

+            restoreWebView(savedInstanceState);

         }

 

         m_model.getOffline().observe(this, (offline) -> {

@@ -245,6 +233,21 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
         });

     }

 

+    private void restoreWebView(Bundle savedInstanceState) {

+        if (savedInstanceState != null) {

+            // null means restoring state failed

+            if (m_web.restoreState(savedInstanceState) == null)

+                if (m_lastVisitedURL != null)

+                    m_web.loadUrl(m_lastVisitedURL);

+                else

+                    m_web.loadUrl(m_baseUrl + "/index.php");

+        } else if (m_lastVisitedURL != null) {

+            m_web.loadUrl(m_lastVisitedURL);

+        } else {

+            m_web.loadUrl(m_baseUrl + "/index.php");

+        }

+    }

+

     private void updateTheme(final Integer themeColor, final Integer accentColor) {

         Log.d(TAG, "updateTheme:" + themeColor + " " + accentColor);

 

@@ -526,6 +529,7 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
         super.onSaveInstanceState(out);

 

         out.putString("m_lastVisitedURL", m_lastVisitedURL);

+        m_web.saveState(out);

     }

 

     @Override

@@ -574,8 +578,7 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
                                 editor.putString("mtls_certificate_alias", alias);

                                 editor.apply();

 

-                                finish();

-                                startActivity(getIntent());

+                                recreate();

                             });

                         }

                     }