summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorfox <fox@fakecake.org>2026-03-09 17:05:28 +0300
committerfox <fox@fakecake.org>2026-03-09 17:05:28 +0300
commit397ca683717ba9e10a440a81f194279f0d8d0d83 (patch)
treeba215b37c2386924c0bab64f085b25b0f4f3af78
parent72b3e6c7491e41fee5b0744ddb8aa59c19c91aba (diff)
parent01183316bfb56d6cf99a8c2c451442eca579e927 (diff)
downloadthe-epube-android-26.03-397ca683-signed.tar.gz
the-epube-android-26.03-397ca683-signed.tar.xz
Merge branch 'dev' into 'master' 26.03-397ca683-signed
Dev

See merge request git/the-epube-android!3
-rw-r--r--org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java32
-rw-r--r--org.fox.epube/src/main/java/org/fox/epube/MasterModel.java11
2 files changed, 35 insertions, 8 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 5f9b77f..06cd833 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
@@ -40,9 +40,13 @@ 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();

@@ -153,7 +157,7 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
 

                     request.cancel();

                 } else {

-                    request.proceed(m_model.getPrivateKey(), m_model.getClientCertChain());

+                    request.proceed(m_model.getPrivateKey().getValue(), m_model.getClientCertChain().getValue());

                 }

             }

 

@@ -180,11 +184,31 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
 

         m_web.addJavascriptInterface(new WebAppInterface(), "EpubeApp");

         m_web.setScrollBarStyle(WebView.SCROLLBARS_OUTSIDE_OVERLAY);

+        m_web.setBackgroundColor(Color.TRANSPARENT);

 

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

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

+        String clientCertAlias = m_prefs.getString("mtls_certificate_alias", null);

+

+        // we need to wait for model to load private key if mtls is enabled

+        if (clientCertAlias != null) {

+            m_model.getPrivateKey().observe(this, privateKey -> {

+                Log.d(TAG, "observed private key: " + privateKey);

+

+                if (privateKey != null) {

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

+

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

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

+                    } else {

+                        m_web.loadUrl(m_lastVisitedURL);

+                    }

+                }

+            });

         } else {

-            m_web.loadUrl(m_lastVisitedURL);

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

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

+            } else {

+                m_web.loadUrl(m_lastVisitedURL);

+            }

         }

 

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

diff --git a/org.fox.epube/src/main/java/org/fox/epube/MasterModel.java b/org.fox.epube/src/main/java/org/fox/epube/MasterModel.java
index eb54639..9e34980 100644
--- a/org.fox.epube/src/main/java/org/fox/epube/MasterModel.java
+++ b/org.fox.epube/src/main/java/org/fox/epube/MasterModel.java
@@ -76,14 +76,17 @@ public class MasterModel extends AndroidViewModel {
                     e.printStackTrace();
                 }
             });
+        } else {
+            m_clientCertChain.postValue(null);
+            m_clientCertKey.postValue(null);
         }
     }
 
-    public X509Certificate[] getClientCertChain() {
-        return m_clientCertChain.getValue();
+    public MutableLiveData<X509Certificate[]> getClientCertChain() {
+        return m_clientCertChain;
     }
 
-    public PrivateKey getPrivateKey() {
-        return m_clientCertKey.getValue();
+    public MutableLiveData<PrivateKey> getPrivateKey() {
+        return m_clientCertKey;
     }
 }