summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAndrew Dolgov <fox@fakecake.org>2026-03-13 13:52:07 +0300
committerAndrew Dolgov <fox@fakecake.org>2026-03-13 13:52:07 +0300
commit914e59c017462d9ca4e738a55cae08824ebb0a57 (patch)
tree268790417b422a37f3006acfa7ceebb30cc9e332
parentb947ce1d1c37158ea2ccc9b35da68809468843a1 (diff)
downloadthe-epube-android-914e59c017462d9ca4e738a55cae08824ebb0a57.tar.gz
the-epube-android-914e59c017462d9ca4e738a55cae08824ebb0a57.tar.xz
move client cert loader from model to activity, allow request to continue transparently after loading certs
-rw-r--r--org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java56
-rw-r--r--org.fox.epube/src/main/java/org/fox/epube/MasterModel.java34
2 files changed, 49 insertions, 41 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 60c9a4a..0300f9b 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
@@ -16,6 +16,7 @@ import android.os.Bundle;
 import android.preference.PreferenceManager;

 import android.security.KeyChain;

 import android.security.KeyChainAliasCallback;

+import android.security.KeyChainException;

 import android.util.Log;

 import android.util.TypedValue;

 import android.view.Menu;

@@ -44,6 +45,11 @@ import androidx.core.view.WindowInsetsControllerCompat;
 import androidx.lifecycle.ViewModelProvider;

 import androidx.webkit.WebViewAssetLoader;

 

+import java.security.PrivateKey;

+import java.security.cert.X509Certificate;

+import java.util.concurrent.ExecutorService;

+import java.util.concurrent.Executors;

+

 public class MasterActivity extends AppCompatActivity implements NetworkStateReceiver.NetworkStateReceiverListener {

 

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

@@ -60,6 +66,8 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
 

     protected String m_lastVisitedURL;

 

+    private ExecutorService m_executor;

+

     @SuppressLint("SetJavaScriptEnabled")

     @Override

     protected void onCreate(Bundle savedInstanceState) {

@@ -67,6 +75,8 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
 

         super.onCreate(savedInstanceState);

 

+        m_executor = Executors.newSingleThreadExecutor();

+

         if (savedInstanceState != null) {

             m_lastVisitedURL = savedInstanceState.getString("m_lastVisitedURL");

         }

@@ -150,12 +160,12 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
 

             @Override

             public void onReceivedClientCertRequest(WebView view, ClientCertRequest request) {

-                if ("".equals(m_prefs.getString("mtls_certificate_alias", ""))) {

-                    pickClientCertificate();

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

 

-                    request.cancel();

+                if (alias != null) {

+                    loadClientCertAndKey(alias, request);

                 } else {

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

+                    pickClientCertificate(request);

                 }

             }

 

@@ -184,7 +194,7 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
         m_web.setScrollBarStyle(WebView.SCROLLBARS_OUTSIDE_OVERLAY);

         m_web.setBackgroundColor(Color.TRANSPARENT);

 

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

+        /* 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) {

@@ -199,7 +209,9 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
             });

         } else {

             restoreWebView(savedInstanceState);

-        }

+        } */

+

+        restoreWebView(savedInstanceState);

 

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

             Log.d(TAG, "observed offline mode change to: " + offline);

@@ -564,7 +576,7 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
         context.unregisterReceiver(m_networkStateReceiver);

     }

 

-    public void pickClientCertificate() {

+    public void pickClientCertificate(ClientCertRequest request) {

         KeyChain.choosePrivateKeyAlias(

                 this, // The current Activity

                 new KeyChainAliasCallback() {

@@ -577,9 +589,11 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
                                 SharedPreferences.Editor editor = m_prefs.edit();

                                 editor.putString("mtls_certificate_alias", alias);

                                 editor.apply();

-

-                                recreate();

                             });

+

+                            loadClientCertAndKey(alias, request);

+                        } else {

+                            request.cancel();

                         }

                     }

                 },

@@ -591,4 +605,28 @@ public class MasterActivity extends AppCompatActivity implements NetworkStateRec
         );

     }

 

+    public void loadClientCertAndKey(String clientCertAlias, ClientCertRequest request) {

+        if (clientCertAlias != null) {

+            m_executor.execute(() -> {

+                X509Certificate[] clientCertChain = null;

+                PrivateKey privateKey = null;

+

+                try {

+                    clientCertChain = KeyChain.getCertificateChain(this, clientCertAlias);

+                    privateKey = KeyChain.getPrivateKey(this, clientCertAlias);

+                } catch (Exception e) {

+                    e.printStackTrace();

+                }

+

+                if (clientCertChain != null && privateKey != null) {

+                    request.proceed(privateKey, clientCertChain);

+                } else {

+                    // try again...

+                    pickClientCertificate(request);

+                }

+            });

+        } else {

+            pickClientCertificate(request);

+        }

+    }

 }
\ No newline at end of file
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 9e34980..6b0f704 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
@@ -1,9 +1,11 @@
 package org.fox.epube;
 
 import android.app.Application;
+import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 import android.security.KeyChain;
+import android.webkit.ClientCertRequest;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.AndroidViewModel;
@@ -52,41 +54,9 @@ public class MasterModel extends AndroidViewModel {
         return m_isOffline;
     }
 
-    private ExecutorService m_executor;
-
-    private MutableLiveData<X509Certificate[]> m_clientCertChain = new MutableLiveData<>(null);
-    private MutableLiveData<PrivateKey> m_clientCertKey = new MutableLiveData<>(null);
-
     public MasterModel(@NonNull Application application) {
         super(application);
 
         m_prefs = PreferenceManager.getDefaultSharedPreferences(application);
-
-        // do we need concurrency or not?
-        m_executor = Executors.newSingleThreadExecutor();
-
-        String clientCertAlias = m_prefs.getString("mtls_certificate_alias", null);
-
-        if (clientCertAlias != null) {
-            m_executor.execute(() -> {
-                try {
-                    m_clientCertChain.postValue(KeyChain.getCertificateChain(application, clientCertAlias));
-                    m_clientCertKey.postValue(KeyChain.getPrivateKey(application, clientCertAlias));
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            });
-        } else {
-            m_clientCertChain.postValue(null);
-            m_clientCertKey.postValue(null);
-        }
-    }
-
-    public MutableLiveData<X509Certificate[]> getClientCertChain() {
-        return m_clientCertChain;
-    }
-
-    public MutableLiveData<PrivateKey> getPrivateKey() {
-        return m_clientCertKey;
     }
 }